summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* fix podman pod inspect to support multiple podsPaul Holzinger2022-09-08
| | | | | | | | | | | | | | | | | Just like the other inspect commands `podman pod inspect p1 p2` should return the json for both. To correctly implement this we follow the container inspect logic, this allows use to reuse the global inspect command. Note: To not break the existing single pod output format for podman pod inspect I added a pod-legacy inspect type. This is only used to make sure we will print the pod as single json and not an array like for the other commands. We cannot use the pod type since podman inspect --type pod did return an array and we should not break that as well. Fixes #15674 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* Merge pull request #15672 from edsantiago/docs_dedup_userns_podOpenShift Merge Robot2022-09-07
|\ | | | | [CI:DOCS] Man pages: refactor common options: --userns (pod)
| * Man pages: refactor common options: --userns (pod)Ed Santiago2022-09-07
| | | | | | | | | | | | | | | | Another easy one. Difference is that pod-create was fixed in #14532 (s/ignore/not allowed/) but pod-clone was not. I went with the fixed version. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #15668 from giuseppe/skip-sys-fs-cgroup-systemd-if-missingOpenShift Merge Robot2022-09-07
|\ \ | | | | | | podman: skip /sys/fs/cgroup/systemd if not present
| * | podman: skip /sys/fs/cgroup/systemd if not presentGiuseppe Scrivano2022-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip adding the /sys/fs/cgroup/systemd bind mount if it is not already present on the host. [NO NEW TESTS NEEDED] requires a system without systemd. Closes: https://github.com/containers/podman/issues/15647 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #15670 from Luap99/debugOpenShift Merge Robot2022-09-07
|\ \ \ | |_|/ |/| | proper --debug/-D flag support
| * | proper --debug/-D flag supportPaul Holzinger2022-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --debug should not be a global flag, you can only use this as podman --debug never podman ps --debug. This matches docker and allows us to add the shorthand "D" since they now no longer conflict. Fixes changes from commit 2d30b4dee596 which claims to add -D but never did. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #15669 from edsantiago/docs_dedup_privilegedOpenShift Merge Robot2022-09-07
|\ \ \ | |/ / |/| | [CI:DOCS] Man pages: refactor common options: --privileged
| * | Man pages: refactor common options: --privilegedEd Santiago2022-09-07
|/ / | | | | | | | | | | An easy one. Went with the version from podman-run. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #15653 from edsantiago/docs_dedup_sysctlOpenShift Merge Robot2022-09-07
|\ \ | | | | | | [CI:DOCS] Man pages: refactor common options: --sysctl
| * | Man pages: refactor common options: --sysctlEd Santiago2022-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As promised, harder and harder to review. Please take your time with this one. For IPC, I went with the list form. For net, I used the single- sentence form instead of a one-element list. The container/pod diffs are clumsy, sorry. Maybe it's time to start thinking of a more flexible conditional mechanism, but I'd really like to avoid that so I hope this is acceptable. In the first sentence I went with 'namespaced' (final 'd') in all instances. I also got rid of the 'new' in 'new pod' in pod-clone. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #15649 from dfr/freebsd-conmonOpenShift Merge Robot2022-09-07
|\ \ \ | | | | | | | | Fixes for conmon support on FreeBSD
| * | | libpod: Filter out ENOTCONN errors when trying to close unix domain socketsDoug Rabson2022-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On FreeBSD, ENOTCONN can be reported if shutdown is called on a unix domain socket where the remote end is already closed. This change ignores those errors instead of printing an error message on container exit. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | libpod: Factor out capabilites code from prepareProcessExecDoug Rabson2022-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the code which sets the process capabilites for the exec to oci_conmon_exec_linux.go since this is a linux-specific feature. Adding a no-op stub for FreeBSD enables 'podman exec' when using the ocijail runtime. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
* | | | Merge pull request #15663 from sstosh/fix-proxy-testOpenShift Merge Robot2022-09-07
|\ \ \ \ | | | | | | | | | | system tests: fix systemd tests in proxy environment
| * | | | system tests: fix systemd tests in proxy environmentToshiki Sonoda2022-09-07
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under proxy environment, we need to add proxy environment variables. Related to: #15639 Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
* | | | Merge pull request #15634 from bbalp/update-system-reset-warning-messageOpenShift Merge Robot2022-09-07
|\ \ \ \ | | | | | | | | | | Update system reset warning message regarding deletion of volumes
| * | | | Update the displayed warning in documentation regarding the system resetBarnabé BALP2022-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Barnabé BALP <contact@barnabebalp.fr>
| * | | | Update system reset warning message to warn against deletion of all volumesBarnabé BALP2022-09-05
| | | | | | | | | | | | | | | Signed-off-by: Barnabé BALP <contact@barnabebalp.fr>
* | | | | Merge pull request #15655 from n1hility/increase-pipe-waitOpenShift Merge Robot2022-09-07
|\ \ \ \ \ | | | | | | | | | | | | Fix intermittent issue with Compat API proxy startup on Windows
| * | | | | Change pipe wait to 20 secondsJason T. Greene2022-09-06
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
* | | | | Merge pull request #15633 from thediveo/eventsOpenShift Merge Robot2022-09-07
|\ \ \ \ \ | |_|_|/ / |/| | | | Closes #15617: emit container labels for container exited and exec died events
| * | | | emit container labels also for container exited and exec died eventsHarald Albrecht2022-09-06
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | - adds unit test for container labels on container die event - implements #15617 Signed-off-by: Harald Albrecht <harald.albrecht@gmx.net>
* | | | Merge pull request #15654 from tyler92/fix-ctr-remove-after-power-offOpenShift Merge Robot2022-09-06
|\ \ \ \ | | | | | | | | | | fix Pod removal after OS hard shutdown
| * | | | fix Pod removal after OS hard shutdownMikhail Khachayants2022-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of a hard OS shutdown, containers may have a "removing" state after a reboot, and an attempt to remove Pods with such containers is unsuccessful: error freeing lock for container ...: no such file or directory [NO NEW TESTS NEEDED] Signed-off-by: Mikhail Khachayants <tyler92@inbox.ru>
* | | | | Merge pull request #15547 from vrothberg/RUN-1606OpenShift Merge Robot2022-09-06
|\ \ \ \ \ | | | | | | | | | | | | Support auto updates for Kubernetes workloads
| * | | | | kube play: support auto updates and rollbacksValentin Rothberg2022-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add auto-update support to `podman kube play`. Auto-update policies can be configured for: * the entire pod via the `io.containers.autoupdate` annotation * a specific container via the `io.containers.autoupdate/$name` annotation To make use of rollbacks, the `io.containers.sdnotify` policy should be set to `container` such that the workload running _inside_ the container can send the READY message via the NOTIFY_SOCKET once ready. For further details on auto updates and rollbacks, please refer to the specific article [1]. Since auto updates and rollbacks bases on Podman's systemd integration, the k8s YAML must be executed in the `podman-kube@` systemd template. For further details on how to run k8s YAML in systemd via Podman, please refer to the specific article [2]. An examplary k8s YAML may look as follows: ```YAML apiVersion: v1 kind: Pod metadata: annotations: io.containers.autoupdate: "local" io.containers.autoupdate/b: "registry" labels: app: test name: test_pod spec: containers: - command: - top image: alpine name: a - command: - top image: alpine name: b ``` [1] https://www.redhat.com/sysadmin/podman-auto-updates-rollbacks [2] https://www.redhat.com/sysadmin/kubernetes-workloads-podman-systemd Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
| * | | | | pkg/autoupdate: allow updating multiple tasks per unitValentin Rothberg2022-09-05
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the auto-update backend to allow for updating multiple tasks/containers per unit. This commit is merely doing the plumbing. The actual integration comes in a following commit. [NO NEW TESTS NEEDED] as behavior should not change and existing tests are expected to continue to pass. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* | | | | Merge pull request #15621 from ventifus/fix-manpage-headerOpenShift Merge Robot2022-09-06
|\ \ \ \ \ | |_|_|/ / |/| | | | [CI:DOCS] Fix manpage header formatting
| * | | | Fix manpage headersAndrew Denton2022-09-06
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrew Denton <adenton@redhat.com>
* | | | | Merge pull request #15650 from edsantiago/docs_dedup_deviceOpenShift Merge Robot2022-09-06
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Man pages: refactor common options: --device
| * | | | | Man pages: refactor common options: --deviceEd Santiago2022-09-06
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refactors are starting to get harder to review - sorry. Here the differences are pretty small, mostly changes to the "it is a combination" wording and some asteriskization. The more significant diffs are that there are some Notes that are pod- or container- or build-specific; I needed to move those from the middle to the end, then keep them in the source files themselves. I don't think this affects readability of the resulting man pages, but your opinion may differ. Last important thing: I included the /dev/fuse text in the common option, which means it will now show up in podman-build (it was not previously there). If this text is not applicable to podman-build, please LMK ASAP so I can just move it back to individual source files. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #15645 from ↵OpenShift Merge Robot2022-09-06
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/container-orchestrated-devices/container-device-interface-0.5.1 build(deps): bump github.com/container-orchestrated-devices/container-device-interface from 0.5.0 to 0.5.1
| * | | | build(deps): bump ↵dependabot[bot]2022-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com/container-orchestrated-devices/container-device-interface Bumps [github.com/container-orchestrated-devices/container-device-interface](https://github.com/container-orchestrated-devices/container-device-interface) from 0.5.0 to 0.5.1. - [Release notes](https://github.com/container-orchestrated-devices/container-device-interface/releases) - [Commits](https://github.com/container-orchestrated-devices/container-device-interface/compare/v0.5.0...v0.5.1) --- updated-dependencies: - dependency-name: github.com/container-orchestrated-devices/container-device-interface dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | | Merge pull request #15644 from Luap99/event-formatOpenShift Merge Robot2022-09-06
|\ \ \ \ \ | |_|_|_|/ |/| | | | fix podman events with custom format
| * | | | remove SkipIfNotFedora() from events testPaul Holzinger2022-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They should work on all distros. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | | | fix podman events with custom formatPaul Holzinger2022-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | podman events --format {{.ID}} was not working since the template was converted to a range but we only render each event individually. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | | Merge pull request #15639 from fj-tsubasa/system-test-proxyOpenShift Merge Robot2022-09-06
|\ \ \ \ \ | | | | | | | | | | | | system tests: fix some tests in proxy environment
| * | | | | system tests: fix some tests in proxy environmentTsubasa Watanabe2022-09-06
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some system tests in `255-auto-update.bats` and `500-networking.bats` fail under proxy environment. This PR fixes this problem. Signed-off-by: Tsubasa Watanabe <w.tsubasa@fujitsu.com>
* | | | | Merge pull request #15584 from sstosh/generate-systemd-envOpenShift Merge Robot2022-09-06
|\ \ \ \ \ | | | | | | | | | | | | Add generate systemd -e/--env option
| * | | | | Add generate systemd -e/--env optionToshiki Sonoda2022-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -e/--env option sets environment variables to the systemd unit files. Fixes: #15523 Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
* | | | | | Merge pull request #15638 from n1hility/stale-config-fixOpenShift Merge Robot2022-09-06
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | (Windows) Drop stale config value resulting in asymmetric config
| * | | | | Drop stale config value resulting in asymmetric configJason T. Greene2022-09-06
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes log follow operations since corresponding k8s-file backend was previously dropped Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
* | | | | Merge pull request #15632 from dfr/freebsd-containerOpenShift Merge Robot2022-09-06
|\ \ \ \ \ | | | | | | | | | | | | Add support for FreeBSD containers
| * | | | | libpod: Factor out setting volume atime to container_internal_linux.goDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that field names in syscall.Stat_t are platform-specific. An alternative to this could change fixVolumePermissions to use unix.Lstat since unix.Stat_t uses the same mmember name for Atim on both Linux and FreeBSD. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | | libpod: Move miscellaneous file handlling to container_internal_common.goDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | | libpod: Don't mount /dev/shm in containers on FreeBSDDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mount has never been standard on FreeBSD, preferring to use /tmp or /var/tmp optionally with tmpfs to ensure data is lost on a reboot. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | | libpod: Factor out handling of slirp4netns and net=noneDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | | libpod: Move functions related to /etc bind mounts to ↵Doug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | container_internal_common.go [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | | libpod: Move getRootNetNsDepCtr to container_internal_common.goDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>