aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* For compatibility, ignore Content-TypeJhon Honce2021-08-20
| | | | | | | | | | | | | | Endpoint /build logs an info entry when a client uses the wrong Content-Type for build payload. Given Content-Type is ignored and assumed to be "application/x-tar". Endpoint /libpod/build will fail unless "application/x-tar" or "application/tar" is given for Content-Type. "application/tar" will be logged as an info entry. Fixes #11012 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* Merge pull request #11294 from vrothberg/3.3-notify-proxyOpenShift Merge Robot2021-08-20
|\ | | | | [3.3] Implement SD-NOTIFY proxy in conmon
| * Implement SD-NOTIFY proxy in conmonDaniel J Walsh2021-08-20
|/ | | | | | | | | | | This leverages conmon's ability to proxy the SD-NOTIFY socket. This prevents locking caused by OCI runtime blocking, waiting for SD-NOTIFY messages, and instead passes the messages directly up to the host. Backport of commit c22f3e8b4e25. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #11281 from Luap99/3.3-backOpenShift Merge Robot2021-08-19
|\ | | | | [v3.3] backport rootless networking fixes
| * Fix rootless cni dns without systemd stub resolverPaul Holzinger2021-08-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a host uses systemd-resolved but not the resolved stub resolver the following symlinks are created: `/etc/resolv.conf` -> `/run/systemd/resolve/stub-resolv.conf` -> `/run/systemd/resolve/resolv.conf`. Because the code uses filepath.EvalSymlinks we put the new resolv.conf to `/run/systemd/resolve/resolv.conf` but the `/run/systemd/resolve/stub-resolv.conf` link does not exists in the mount ns. To fix this we will walk the symlinks manually until we reach the first one under `/run` and use this for the resolv.conf file destination. This fixes a regression which was introduced in e73d4829900c. Fixes #11222 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * fix rootlessport flakePaul Holzinger2021-08-19
|/ | | | | | | | | | | | | | | | | | | | | When the rootlessport process is started the stdout/stderr are attached to the podman process. However once everything is setup podman exits and when the rootlessport process tries to write to stdout it will fail with SIGPIPE. The code handles this signal and puts /dev/null to stdout and stderr but this is not robust. I do not understand the exact cause but sometimes the process is still killed by SIGPIPE. Either go lost the signal or the process got already killed before the goroutine could handle it. Instead of handling SIGPIPE just set /dev/null to stdout and stderr before podman exits. With this there should be no race and no way to run into SIGPIPE errors. [NO TESTS NEEDED] Fixes #11248 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* Merge pull request #11163 from cevich/v3.3_update_imagesOpenShift Merge Robot2021-08-19
|\ | | | | [V3.3] Update images
| * Skip stats test in CGv1 container environmentsChris Evich2021-08-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests were originally enabled in a situation where CI provided false-positive results. Now that has been corrected, these tests all fail under a CGv1 container environment with the error: ``` Error: unable to load cgroup at /machine.slice/libpod-e4f...086.scope/libpod_parent/libpod-fbd...425: cgroup deleted ``` This commit simply disables the tests under this specific environment. Signed-off-by: Chris Evich <cevich@redhat.com>
| * Fix AVC denials in tests of volume mountsChris Evich2021-08-17
| | | | | | | | | | | | | | | | | | This becomes a problem on hosts with upgraded policies. Ref: https://github.com/containers/podman/issues/10522 Also, made a small change to compose-test setup to reduce runtime. Signed-off-by: Chris Evich <cevich@redhat.com>
| * Restore buildah-bud test requiring new imagesChris Evich2021-08-17
| | | | | | | | | | | | | | Ref: https://github.com/containers/podman/pull/10829#issuecomment-881355983 Signed-off-by: Chris Evich <cevich@redhat.com>
| * Revert ".cirrus.yml: use fresh images for all VMs"Chris Evich2021-08-17
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 404d5edb1557e3d2cb255d38bd89274586c4c100. The replacement (updated) images include a fix for: https://github.com/containers/common/issues/631 Also minor update to an unrelated FIXME comment. Signed-off-by: Chris Evich <cevich@redhat.com>
| * Fix device tests using ls test filesChris Evich2021-08-17
| | | | | | | | | | | | | | | | | | | | | | The `ls` command is not intended for this purpose and may behave in unexpected ways, leading to false positive or negative results. Update the tests to use the purpose built `test` command instead. Also added several *TODO* comments for possible future testing enhancements. Signed-off-by: Chris Evich <cevich@redhat.com>
| * Enhance priv. dev. checkChris Evich2021-08-17
| | | | | | | | | | | | | | | | Update test to confirm the negative-case, proving the `--privileged` "option is required" for this character device to be present in a container (including rootless). Signed-off-by: Chris Evich <cevich@redhat.com>
| * Workaround host availability of /dev/kvmChris Evich2021-08-17
| | | | | | | | | | | | | | | | | | | | | | | | This test has been failing for a long time but nobody noticed because CI doesn't have the device node (nested-VM support was disabled). After having enabled nested VM support, tests fail due to some unknown special-handling of this device. Fix both problems by removing the `skip()` and switching to a more generic device which is only present when `--privileged` is used. Signed-off-by: Chris Evich <cevich@redhat.com>
| * Skip cgroup-parent test due to frequent flakesChris Evich2021-08-17
| | | | | | | | | | | | Ref: https://github.com/containers/podman/issues/11165 Signed-off-by: Chris Evich <cevich@redhat.com>
| * Cirrus: Fix not uploading logformatter htmlChris Evich2021-08-17
|/ | | | | | | Previously we were generating the annotated results but never uploading them. Fix this so visiting the advertised URL actually works. Signed-off-by: Chris Evich <cevich@redhat.com>
* Merge pull request #11254 from mheon/bump_330_rc3openshift-ci[bot]2021-08-17
|\ | | | | [CI:DOCS] Bump to v3.3.0-RC3
| * Bump to v3.3.0-devMatthew Heon2021-08-17
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Bump to v3.3.0-RC3v3.3.0-rc3Matthew Heon2021-08-17
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Release notes for v3.3.0-RC3Matthew Heon2021-08-17
|/ | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* Merge pull request #11250 from TomSweeneyRedHat/dev/tsweeney/bumpcstorageopenshift-ci[bot]2021-08-17
|\ | | | | [v3.3] Bump c/storage to v1.34.1 and c/image to v5.15.1
| * [v3.3] Bump c/storage to v1.34.1 and c/image to v5.15.1TomSweeneyRedHat2021-08-17
|/ | | | | | | | | | Bump c/storage to v1.34.1 and c/image to v5.15.1 for Podman v3.3 rc3 [NO TESTS NEEDED] [NO NEW TESTS NEEDED] Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* Merge pull request #11234 from baude/v3.3fixmacospathopenshift-ci[bot]2021-08-16
|\ | | | | fix gvproxy path search for macos
| * fix gvproxy path search for macosBrent Baude2021-08-16
|/ | | | | | | | | | | macos does not have /usr/libexec/ so we look in the executable paths first. Fixes: #11226 [NO TESTS NEEDED] Signed-off-by: Brent Baude <bbaude@redhat.com>
* Merge pull request #11221 from lsm5/v3.3.0-rc2Daniel J Walsh2021-08-12
|\ | | | | V3.3.0 rc2
| * Bump to v3.3.0-devLokesh Mandvekar2021-08-12
| | | | | | | | Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
| * Bump to v3.3.0-rc2v3.3.0-rc2Lokesh Mandvekar2021-08-12
|/ | | | Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* Merge pull request #11215 from baude/v3.3gvproxyopenshift-ci[bot]2021-08-12
|\ | | | | Set gvproxy path to /usr/libexec/podman/gvproxy
| * Set gvproxy path to /usr/libexec/podman/gvproxyBrent Baude2021-08-12
|/ | | | | | | | | We have reverted the previous patches to look for the gvproxy binary in /usr/lib/podman and have again decided to use /usr/libexec/podman [NO TESTS NEEDED] Signed-off-by: Brent Baude <bbaude@redhat.com>
* Merge pull request #11193 from mheon/release_notes_33openshift-ci[bot]2021-08-11
|\ | | | | Release notes for Podman v3.3.0-RC2
| * Revert "Podman Pod Create --cpus and --cpuset-cpus flags"Matthew Heon2021-08-11
| | | | | | | | | | | | | | | | | | This reverts commit bbd085ad1e3cf9c5b543c907ad7014ccf8a5cb34. The cgroup work to enable these has not happened yet and will not be ready in time for the release of Podman 3.3.0. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * Address review commentsMatthew Heon2021-08-11
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * Final release notes for v3.3.0-RC2Matthew Heon2021-08-11
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * Document source ip for the rootlesskit port handlerPaul Holzinger2021-08-11
| | | | | | | | | | | | | | | | Also add some missing options to podman pod create. Fixes #10884 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * podman info show correct slirp4netns pathPaul Holzinger2021-08-11
| | | | | | | | | | | | | | | | | | The slirp4netns path can be set in the config file or with --network-cmd-path. Podman info should read the version information correctly and not use PATH in this case. Also show the slirp4netns version information to root users. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * show podman machine ssh command lineBrent Baude2021-08-11
| | | | | | | | | | | | | | | | | | | | | | | | A user contributed a one line PR that enabled logging the podman machine ssh command for debug. The user was not able to complete the submission so this PR replaces that. [NO TESTS NEEDED] Replaces #10798 Signed-off-by: Brent Baude <bbaude@redhat.com>
| * Fix TS parsing for fractional valuesMatej Vasek2021-08-11
| | | | | | | | | | | | Parse Unix timestamps that contains fractional part. Signed-off-by: Matej Vasek <mvasek@redhat.com>
| * Handle timezone on server containers.confDaniel J Walsh2021-08-11
| | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/11124 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@localhost.localdomain> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * Fix podman unpause,pause,kill --all to work like podman stop --allDaniel J Walsh2021-08-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if you execute podman unpause --all, podman pause --all Podman shows attempts to unpause containers that are not paused and prints an error. This PR catches this error and only prints errors if a paused container was not able to be unpaused. Currently if you execute podman pause --all or podman kill --all, Podman Podman shows attempts to pause or kill containers that are not running and prints an error. This PR catches this error and only prints errors if a running container was not able to be paused or killed. Also change printing of multiple errors to go to stderr and to prefix "Error: " in front to match the output of the last error. Fixes: https://github.com/containers/podman/issues/11098 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * Do not add an entry to /etc/hosts with `--net=host`Matthew Heon2021-08-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To match Docker's behavior, in the `--net=host` case, we need to use the host's `/etc/hosts` file, unmodified (without adding an entry for the container). We will still respect hosts from `--add-host` but will not make any automatic changes. Fortuntely, this is strictly a matter of removal and refactoring as we already base our `/etc/hosts` on the host's version - just need to remove the code that added entries when net=host was set. Fixes #10319 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * Only support containers stats using cgroups v2Jhon Honce2021-08-10
| | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1988252 Signed-off-by: Jhon Honce <jhonce@redhat.com>
| * Compat API: Fix healthcheck status and healthcheck configMilivoje Legenovic2021-08-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: - Do not show healthcheck status if not available or if container status is "created" (Docker behaviour) - Show healthcheck configuration if present (Config.Healthcheck) Tests: - Ensure State.Health is not present if container status is "created" - Ensure Config.Healthcheck is present and values correct - Ensure State.Health is present if container started Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
| * podman info: try qfile before equeryEd Santiago2021-08-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | podman info takes >20s on Gentoo, because equery is s..l..o..w. qfile is much faster and, I suspect, present in most Gentoo installations, so let's try it first. And, because packageVersion() was scarily unmaintainable, refactor it. Define a simple (string) list of packaging tools to query (rpm, dpkg, ...) and iterate until we find one that works. IMPORTANT NOTE: the Debian (and, presumably, Ubuntu) query does not include version number! There is no standard way on Debian to get a package version from a file path, you can only do it via pipes of chained commands, and I have no desire to implement that. Signed-off-by: Ed Santiago <santiago@redhat.com>
| * test: move container process to a sub-cgroupGiuseppe Scrivano2021-08-10
| | | | | | | | | | | | | | move the container to a sub-cgroup before creating a sibling hierarchy. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * Fix handling of user specified container labelsDaniel J Walsh2021-08-10
| | | | | | | | | | | | | | | | | | | | | | Currently we override the SELinux labels specified by the user if the container is runing a kata container or systemd container. This PR fixes to use the label specified by the user. Fixes: https://github.com/containers/podman/issues/11100 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * Release notes for v3.3.0-RC2: InitialMatthew Heon2021-08-10
|/ | | | | | | This does not include subsequent backports, which will be added later. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* Merge pull request #11150 from Luap99/v3.3-netconopenshift-ci[bot]2021-08-06
|\ | | | | [v3.3] fix rootless port forwarding with network dis-/connect
| * Bump github.com/rootless-containers/rootlesskit from 0.14.3 to 0.14.4dependabot[bot]2021-08-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/rootless-containers/rootlesskit](https://github.com/rootless-containers/rootlesskit) from 0.14.3 to 0.14.4. - [Release notes](https://github.com/rootless-containers/rootlesskit/releases) - [Commits](https://github.com/rootless-containers/rootlesskit/compare/v0.14.3...v0.14.4) --- updated-dependencies: - dependency-name: github.com/rootless-containers/rootlesskit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
| * fix rootless port forwarding with network dis-/connectPaul Holzinger2021-08-06
|/ | | | | | | | | | | | | | | | | | | | | | | | The rootlessport forwarder requires a child IP to be set. This must be a valid ip in the container network namespace. The problem is that after a network disconnect and connect the eth0 ip changed. Therefore the packages are dropped since the source ip does no longer exists in the netns. One solution is to set the child IP to 127.0.0.1, however this is a security problem. [1] To fix this we have to recreate the ports after network connect and disconnect. To make this work the rootlessport process exposes a socket where podman network connect/disconnect connect to and send to new child IP to rootlessport. The rootlessport process will remove all ports and recreate them with the new correct child IP. Also bump rootlesskit to v0.14.3 to fix a race with RemovePort(). Fixes #10052 [1] https://nvd.nist.gov/vuln/detail/CVE-2021-20199 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* Merge pull request #11147 from TomSweeneyRedHat/dev/tsweeney/buildah3.3openshift-ci[bot]2021-08-06
|\ | | | | [v3.3] Bump to Buildah v1.22.0 [NO NEW TESTS NEEDED]