summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #12208 from cdoern/podSecurityOptOpenShift Merge Robot2022-01-05
|\ | | | | Pod Security Option support and Infra Inheritance changes
| * Pod Security Option supportcdoern2021-12-27
| | | | | | | | | | | | | | | | | | | | | | | | | | Added support for pod security options. These are applied to infra and passed down to the containers as added (unless overridden). Modified the inheritance process from infra, creating a new function Inherit() which reads the config, and marshals the compatible options into an intermediate struct `InfraInherit` This is then unmarshaled into a container config and all of this is added to the CtrCreateOptions. Removes the need (mostly) for special additons which complicate the Container_create code and pod creation. resolves #12173 Signed-off-by: cdoern <cdoern@redhat.com>
* | Merge pull request #12168 from mtrmac/socket-collisionOpenShift Merge Robot2022-01-05
|\ \ | | | | | | Avoid RemoteSocket collisions in e2e tests
| * | Don't initialize the global RNG with GinkgoRandomSeed() in e2e testsMiloslav Trmač2022-01-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - It probably doesn't actually make a difference: in experiments, the github.com/containers/storage/pkg/stringid RNG initialization has been happening later - This makes the RNG caller-controlled (which we don't benefit from), but also the same on all nodes of multi-process Ginkgo execution. So, if it works at all, it may make collisions of random ID values more likely, and our tests are not robust against that. So don't go out of our way to make collisions more likely. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | Avoid collisions on RemoteSocket pathsMiloslav Trmač2022-01-03
| | | | | | | | | | | | | | | | | | | | | Add lock files and re-generate the UUID if we are not a known-unique user of the socket path. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | Refactor remote socket path determination in testsMiloslav Trmač2022-01-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate the code that determines the directory and file prefix from the code that chooses and applies a UUID; we will make the second part more complex in a bit. Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | Merge pull request #12429 from cdoern/scpOpenShift Merge Robot2022-01-05
|\ \ \ | | | | | | | | podman image scp never enter podman user NS
| * | | podman image scp never enter podman user NScdoern2021-12-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman image scp should never enter the Podman UserNS unless it needs to. This allows for a sudo exec.Command to transfer images to and from rootful storage. If this command is run using sudo, the simple sudo podman save/load does not work, machinectl/su is necessary here. This modification allows for both rootful and rootless transfers, and an overall change of scp to be more of a wrapper function for different load and save calls as well as the ssh component Signed-off-by: cdoern <cdoern@redhat.com>
* | | | Merge pull request #12744 from kolyshkin/fix-flakeOpenShift Merge Robot2022-01-05
|\ \ \ \ | | | | | | | | | | Fix test flake in test/e2e/pod_initcontainers
| * | | | test/e2e/pod_initcontainers: fix a flakeKir Kolyshkin2022-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3c3fa6fac4d0f8e8 added a few test cases for the init containers. The "podman ensure always init containers always run" implicitly assumes that restarting a pod will take more than 1 second. When this assumption is not met (because computers are fast!), we get a flake. The fix (without using sleep) is to print nanoseconds in date output. This format option (%N) is not supported by date in Alpine Linux, so switch to Fedora. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
| * | | | test/e2e/run: don't use date +%N on AlpineKir Kolyshkin2022-01-04
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit e1443fe05d146def6 added a test case that ran "date +%N" inside a Fedora container (without actually using its output). Commit ccc5bc167fa2c140 changed that test case to use Alpine. Problem is, %N is not supported by date in Alpine (it only prints a newline). To eliminate the ambiguity, replace date with touch. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
* | | | Merge pull request #12735 from rhatdan/mountOpenShift Merge Robot2022-01-04
|\ \ \ \ | | | | | | | | | | Fix Container List API call to return mount info
| * | | | Fix Container List API call to return mount infoDaniel J Walsh2022-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are hard coding mounts to return nil in compat API, since we have the data, we should return it. Fixes: https://github.com/containers/podman/issues/12734 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #12643 from leahneukirchen/events-compatOpenShift Merge Robot2022-01-04
|\ \ \ \ \ | | | | | | | | | | | | legacy events: also set Action="die"
| * | | | | legacy events: also set exitCodeLeah Neukirchen2022-01-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Status = "die", Docker sets the exit code of the container to a field "exitCode". Podman uses "containerExitCode". Copy the value into "exitCode" as well, for compatibility. Signed-off-by: Leah Neukirchen <leah@vuxu.org>
| * | | | | legacy events: also set Action="die"Leah Neukirchen2021-12-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #10168, on the event "died", the Status is set to "die" for compatibility with the Docker API. Docker also sets the field Action to "died", so do the same here. Signed-off-by: Leah Neukirchen <leah@vuxu.org>
* | | | | | Merge pull request #12709 from flouthoc/ign_add_certsOpenShift Merge Robot2022-01-04
|\ \ \ \ \ \ | | | | | | | | | | | | | | ignition: add `certs` from current user into the machine while `init`
| * | | | | | ignition: add certs from current user into the machine while initAditya Rajan2021-12-27
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following PR ensures that certs from `~/.config/containers/certs.d` or `~/.config/docker/certs.d` are copied into the remote machine at `/etc/containers/certs.d/` As a result on platforms like `macOS` where podman works with a remote machine setup. User's local certs must be transferd to VM without any plumbing needed by user. [NO-NEW-TESTS-NEEDED] Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | | | | | Merge pull request #12738 from pdostal/podman_searchOpenShift Merge Robot2022-01-04
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [CI:DOCS] Fix wrong 'podman search --format' placeholder
| * | | | | Fix wrong 'podman search --format' placeholderPavel Dostál2022-01-04
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Pavel Dostál <pdostal@suse.cz>
* | | | | Merge pull request #12611 from Luap99/ipv6OpenShift Merge Robot2022-01-03
|\ \ \ \ \ | | | | | | | | | | | | add --ip6 flag to podman create/run
| * | | | | add --ip6 flag to podman create/runPaul Holzinger2022-01-03
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the --ipv6 flag to podman create/run and pod create. We support the --network name:ip6=<ip> syntax now but for docker compat we should also support the --ip6 flag. Note that there is no validation if the ip is actually a v6 or v4 address because the backend does not care either. Fixes #7511 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | | Merge pull request #12732 from strideynet/fix-default-cpu-period-commentOpenShift Merge Robot2022-01-03
|\ \ \ \ \ | | | | | | | | | | | | fix misleading comment regarding default value of cpu period
| * | | | | fix misleading comment regarding default value of cpu period [NO NEW TESTS ↵Noah Stride2022-01-03
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | NEEDED] Signed-off-by: Noah Stride <noah@noahstride.co.uk>
* | | | | Merge pull request #12697 from baude/servicefailedstatesOpenShift Merge Robot2022-01-03
|\ \ \ \ \ | | | | | | | | | | | | .service file removal on failure
| * | | | | .service file removal on failureBrent Baude2021-12-26
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prodding bz #2024229 a little more, it turns out the service file is NOT deleted when it is in a failed state (i.e the healtch check has failed for some reason). The state must be reset before the service is stopped on container removal and then the files will be removed properly. BZ#:2024229 [NO NEW TESTS NEEDED] Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | | Merge pull request #12725 from rhatdan/testOpenShift Merge Robot2022-01-03
|\ \ \ \ \ | | | | | | | | | | | | test/system: podman run with log-opt option
| * | | | | test/system: podman run image with filesystem permissionDaniel J Walsh2021-12-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test case is used for covering rhbz#1854566. Replaces: #12220 Signed-off-by: Alex Jia <ajia@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | | | | test/system: podman run with log-opt optionDaniel J Walsh2021-12-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test case is used for covering rhbz#1763007. Replaces: #12221 Signed-off-by: Alex Jia <ajia@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #12724 from rhatdan/swaggerOpenShift Merge Robot2022-01-03
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update swagger documentation
| * | | | | | Update swagger documentationDaniel J Walsh2021-12-31
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #12708 from flouthoc/swagger-sort-operationsOpenShift Merge Robot2022-01-03
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [CI:DOCS]: sort swagger operations alpabetically
| * | | | | docs: sort swagger operations alpabeticallyAditya Rajan2021-12-27
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `sort-operations-alphabetically` to sort swagger operations alphabetically [CI:DOCS] [NO-NEW-TESTS-NEEDED] Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | | | | Merge pull request #12731 from Junnplus/typo-ipv4OpenShift Merge Robot2022-01-03
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] fix doc typo
| * | | | | fix docye.sijun2022-01-03
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: ye.sijun <junnplus@gmail.com>
* | | | | Merge pull request #12718 from afbjorklund/machine-resourcesOpenShift Merge Robot2021-12-31
|\ \ \ \ \ | |_|/ / / |/| | | | [CI:DOCS] Add example of cpus to init command
| * | | | [CI:DOCS] Add example of cpus to init commandAnders F Björklund2021-12-30
|/ / / / | | | | | | | | | | | | Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | | Merge pull request #12705 from olitha/compat-api-containers-sha256OpenShift Merge Robot2021-12-29
|\ \ \ \ | |/ / / |/| | | Compat api containers ImageId missing sha256
| * | | prefix imageId with sha256: in containers listOliver2021-12-29
| | | | | | | | | | | | | | | | | | | | | | | | test for compat API ImageId Signed-off-by: Oliver Thallmair <oliver.thallmair@mailbox.org>
* | | | Merge pull request #12503 from n1hility/wsl-machineOpenShift Merge Robot2021-12-26
|\ \ \ \ | |/ / / |/| | | Introduce Windows WSL implementation of podman machine
| * | | Introduce Windows WSL implementation of podman machineJason T. Greene2021-12-24
|/ / / | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] for now Signed-off-by: Jason Greene <jason.greene@redhat.com>
* | | Merge pull request #12627 from rhatdan/passwdOpenShift Merge Robot2021-12-23
|\ \ \ | | | | | | | | Allow users to add host user accounts to /etc/passwd
| * | | Allow users to add host user accounts to /etc/passwdDaniel J Walsh2021-12-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some containers require certain user account(s) to exist within the container when they are run. This option will allow callers to add a bunch of passwd entries from the host to the container even if the entries are not in the local /etc/passwd file on the host. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1935831 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #12679 from vrothberg/fix-12671OpenShift Merge Robot2021-12-23
|\ \ \ \ | |/ / / |/| | | clarify `io.podman.annotations.seccomp`
| * | | container creation: don't apply reserved annotations from imageValentin Rothberg2021-12-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not apply reserved annotations from the image to the container. Reserved annotations are applied during container creation to retrieve certain information (e.g., custom seccomp profile or autoremoval) once a container has been created. Context: #12671 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | [CI:DOCS] clarify `io.podman.annotations.seccomp`Valentin Rothberg2021-12-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify the semantics of the `io.podman.annotations.seccomp` annotation which is set when a container has been created with a custom seccomp profile. Fixes: #12671 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #12692 from giuseppe/fix-additional-ids-docOpenShift Merge Robot2021-12-23
|\ \ \ \ | |/ / / |/| | | [CI:DOCS] docs: document rootless userns mappings
| * | | [CI:DOCS] docs: document rootless userns mappingsGiuseppe Scrivano2021-12-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document how the host IDs are mapped inside the rootless user namespace. Closes: https://github.com/containers/podman/issues/12676 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #12672 from adrianreber/2021-12-21-check-for-memtrackOpenShift Merge Robot2021-12-23
|\ \ \ \ | | | | | | | | | | Error out early if system does not support pre-copy checkpointing
| * | | | Error out early if system does not support pre-copy checkpointingAdrian Reber2021-12-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRIU's pre-copy migration support relies on the soft dirty page tracking in the Linux kernel: https://www.kernel.org/doc/Documentation/vm/soft-dirty.txt This functionality is not implemented for all architectures and it can also be turned off in the kernel. CRIU can check if the combination of architecture/kernel/CRIU supports the soft dirty page tracking and exports this feature checking functionality in go-criu. This commit adds an early check if the user selects pre-copy checkpointing to error out if the system does not support it. Signed-off-by: Adrian Reber <areber@redhat.com>