aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* System tests: fix three racesEd Santiago2022-09-14
| | | | | | | | | | | | | | | Three tests were running 'container rm' on 'start'ed containers that might not yet have exited. Fix. Also, tighten up the tests themselves, to make even more sure that they test what they're supposed to test. Discovered, in CI, that 'podman-remote logs --timestamps' was unimplemented. Thanks to @Luap99 for the fix to that. Fixes: #15783 Fixes: #15795 Signed-off-by: Ed Santiago <santiago@redhat.com>
* Merge pull request #15788 from kolyshkin/non-crypto-idOpenShift Merge Robot2022-09-14
|\ | | | | all: stop using deprecated GenerateNonCryptoID
| * all: stop using deprecated GenerateNonCryptoIDKir Kolyshkin2022-09-13
| | | | | | | | | | | | | | | | | | | | In view of https://github.com/containers/storage/pull/1337, do this: for f in $(git grep -l stringid.GenerateNonCryptoID | grep -v '^vendor/'); do sed -i 's/stringid.GenerateNonCryptoID/stringid.GenerateRandomID/g' $f; done Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
* | Merge pull request #15796 from vrothberg/fix-ciOpenShift Merge Robot2022-09-14
|\ \ | | | | | | fix ci: update systemd generate unit test
| * | fix ci: update systemd generate unit testValentin Rothberg2022-09-14
| | | | | | | | | | | | | | | | | | | | | Two PRs have been merged causing a failure in one unit test. Fix the unit test to turn CI green again. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* | | Merge pull request #15795 from edsantiago/docs_dedup_ip6OpenShift Merge Robot2022-09-14
|\ \ \ | | | | | | | | [CI:DOCS] Man pages: refactor common options: --ip6
| * | | Man pages: refactor common options: --ip6Ed Santiago2022-09-14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to yesterday's --ip. No changes to content, all I did was variableize the instances of 'container'/'pod'. Did not touch podman-network-connect file, but if someone wants to look at that one and tell me whether all this long text is applicable to it (or not), I'd appreciate it. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #15790 from Luap99/slirp-docOpenShift Merge Robot2022-09-14
|\ \ \ | | | | | | | | [CI:DOCS] improve slirp4netns allow_host_loopback docs
| * | | improve slirp4netns allow_host_loopback docsPaul Holzinger2022-09-14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The default ip is 10.0.2.2 but is always the second ip from the slirp4netns subnet, which can be changed via the cidr option. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2090166 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #15769 from dfr/freebsd-statsOpenShift Merge Robot2022-09-14
|\ \ \ | |_|/ |/| | Add support for 'podman stats' on FreeBSD
| * | libpod: Add support for 'podman stats' on FreeBSDDoug Rabson2022-09-14
| | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | libpod: Split out the common code from GetContainerStatsDoug Rabson2022-09-14
| | | | | | | | | | | | | | | | | | | | | | | | This moves the cgroups code to a new method getPlatformContainerStats. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | libpod: Move stats.go to stats_linux.go for consistencyDoug Rabson2022-09-14
| | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | pkg/rctl: Add a simple FreeBSD RCTL libraryDoug Rabson2022-09-14
| |/ | | | | | | | | | | | | | | | | Initially just supporting just rctl_get_racct for (*Container).GetContainerStats. [NO NEW TESTS NEEDED] we are not running any FreeBSD tests in CI Signed-off-by: Doug Rabson <dfr@rabson.org>
* | Merge pull request #15777 from vrothberg/fix-14546OpenShift Merge Robot2022-09-14
|\ \ | | | | | | generate systemd: fix pod dependencies
| * | generate systemd: fix pod dependenciesValentin Rothberg2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the dependencies from a pod unit to its associated container units from `Requires` to `Wants` to prevent the entire pod from transitioning to a failed state. Restart policies for individual containers can be configured separately. Also make sure that the pod's RunRoot is always set. Fixes: #14546 Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* | | Merge pull request #15771 from dcermak/pod-systemd-exit-policyOpenShift Merge Robot2022-09-14
|\ \ \ | |_|/ |/| | [systemd] Ensure that podCreateArgs appear last in ExecStartPre=
| * | [systemd] Ensure that podCreateArgs appear last in ExecStartPre=Dan Čermák2022-09-14
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a new pod without the `--name` flag, e.g.: `podman pod create foobar` it will get the name `foobar` implicitly and this will be recorded as the in the `podCreateArgs`. Unfortunately, the implicit name only works if it appears as the **last** argument of the startup command. With 6e2e3a78ed1d05ee5f23f65b814e8135021961dd we started appending the pod security policy to the startCommand, resulting in the following `ExecStartPre=` line: ``` /usr/bin/podman pod create --infra-conmon-pidfile %t/pod-foobar.pid --pod-id-file %t/pod-foobar.pod-id foobar --exit-policy=stop ``` This fails to launch, as the `pod create` command expects only a single non-flag parameter, but it assumes that `exit-policy=stop` is a second and terminates immediately instead. This fixes https://github.com/containers/podman/issues/15592 Signed-off-by: Dan Čermák <dcermak@suse.com>
* | Merge pull request #15784 from edsantiago/docs_dedup_tlsverifyOpenShift Merge Robot2022-09-13
|\ \ | | | | | | [CI:DOCS] Man pages: refactor common options: --tls-verify
| * | Man pages: refactor common options: --tls-verifyEd Santiago2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ugh. This had about five different variations among twelve files. I went with the version from podman-create, kube play, login, pull, push, run. The others: - manifest-add and create did not include the "true, false, missing" text. Now they do. (If this text is N/A to these two, please yell). Also, these two were written with "talking" instead of "contacting" the registry. - podman-build had "does not work with remote", but this does not seem to be true, so I removed it. None of the other files had that. - the wording in podman-search is just weird, with "if needed" and "is listed" and unclear "insecure registries". I just nuked it all. If that wording was deliberate, for some reason that applies only to podman-search, please yell. - podman-container-runlabel has one diff that I like, actually spelling out containers-registries.conf(5), but incorporating that would make this even harder to review. I will add that to my in-progress doc-cleanup PR. Review recommendation: run hack/markdown-preprocess-review but just quit out of it immediately (on both popups). Ignore it completely. Then cd /tmp/markdown-preprocess-review.diffs/tls-verify and run $ clear;for i in podman-*;do echo;echo $i;wdiff -t $i zzz-chosen.md;done This will show the major diffs between each version and the chosen one. Assumes you have wdiff installed. If you have another colorize-actual- individual-word-diffs tool installed, use that. I like cdif[1]. [1] https://github.com/kaz-utashiro/sdif-tools Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #15673 from Luap99/templateOpenShift Merge Robot2022-09-13
|\ \ \ | |/ / |/| | Fix go template parsing with "\n" in it
| * | rework --format system testPaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | This version does a much better job of error reporting and also catches more commands. Changes from edsantiago. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | enable podman pod inspect --format testPaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that commit d10e77e1bcd2 is merged, it will reuse the same template logic as inspect and therefore should just work. Also remove the FIXME from eds test. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | podman version: use report.Formatter over TemplatePaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the podman command --format output code uses a mix of report.Formatter and report.Template. I patched report.Formatter to correctly handle newlines[1]. Since we cannot fix this with report.Template we have to migrate all users to report.Formatter. This ensures consistent behavior for all commands. This change does not change the output. [1] https://github.com/containers/common/pull/1146 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | podman machine info: use report.Formatter over TemplatePaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the podman command --format output code uses a mix of report.Formatter and report.Template. I patched report.Formatter to correctly handle newlines[1]. Since we cannot fix this with report.Template we have to migrate all users to report.Formatter. This ensures consistent behavior for all commands. This change does not change the output. [1] https://github.com/containers/common/pull/1146 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | podman info: use report.Formatter over TemplatePaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the podman command --format output code uses a mix of report.Formatter and report.Template. I patched report.Formatter to correctly handle newlines[1]. Since we cannot fix this with report.Template we have to migrate all users to report.Formatter. This ensures consistent behavior for all commands. This change does not change the output. [1] https://github.com/containers/common/pull/1146 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | tests for 15673Ed Santiago2022-09-13
| | | | | | | | | | | | Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | podman inspect return exit code > 0 on print errorPaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | Unlikely to happen but when there is an error printing the data to stdout (either as json or go template) we should not just log it and exit with 0. Instead return a proper error and exit with 125. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | podman inspect: use report.Formatter over TemplatePaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the podman command --format output code uses a mix of report.Formatter and report.Template. I patched report.Formatter to correctly handle newlines[1]. Since we cannot fix this with report.Template we have to migrate all users to report.Formatter. This ensures consistent behavior for all commands. This change does not change the output, we can add a new test for the newline bug when the common PR is vendored in. [1] https://github.com/containers/common/pull/1146 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | podman secret inspect: use report.Formatter over TemplatePaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the podman command --format output code uses a mix of report.Formatter and report.Template. I patched report.Formatter to correctly handle newlines[1]. Since we cannot fix this with report.Template we have to migrate all users to report.Formatter. This ensures consistent behavior for all commands. This change does not change the output, we can add a new test for the newline bug when the common PR is vendored in. [1] https://github.com/containers/common/pull/1146 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | podman secret ls: use report.Formatter over TemplatePaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the podman command --format output code uses a mix of report.Formatter and report.Template. I patched report.Formatter to correctly handle newlines[1]. Since we cannot fix this with report.Template we have to migrate all users to report.Formatter. This ensures consistent behavior for all commands. This change does not change the output, we can add a new test for the newline bug when the common PR is vendored in. [1] https://github.com/containers/common/pull/1146 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | podman network ls: use report.Formatter over TemplatePaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the podman command --format output code uses a mix of report.Formatter and report.Template. I patched report.Formatter to correctly handle newlines[1]. Since we cannot fix this with report.Template we have to migrate all users to report.Formatter. This ensures consistent behavior for all commands. This change does not change the output, we can add a new test for the newline bug when the common PR is vendored in. [1] https://github.com/containers/common/pull/1146 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | podman volume ls: use report.Formatter over TemplatePaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the podman command --format output code uses a mix of report.Formatter and report.Template. I patched report.Formatter to correctly handle newlines[1]. Since we cannot fix this with report.Template we have to migrate all users to report.Formatter. This ensures consistent behavior for all commands. This change does not change the output, we can add a new test for the newline bug when the common PR is vendored in. Also fixa bug since the table format is expected to print headers as well. [1] https://github.com/containers/common/pull/1146 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | podman machine inspect: use report.Formatter over TemplatePaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the podman command --format output code uses a mix of report.Formatter and report.Template. I patched report.Formatter to correctly handle newlines[1]. Since we cannot fix this with report.Template we have to migrate all users to report.Formatter. This ensures consistent behavior for all commands. This change does not change the output, we can add a new test for the newline bug when the common PR is vendored in. Also fix a bug where a invlaid template would not cause a exit code > 0, see the added test case. [1] https://github.com/containers/common/pull/1146 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | podman machine ls: use report.Formatter over TemplatePaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the podman command --format output code uses a mix of report.Formatter and report.Template. I patched report.Formatter to correctly handle newlines[1]. Since we cannot fix this with report.Template we have to migrate all users to report.Formatter. This ensures consistent behavior for all commands. This change does not change the output, we can add a new test for the newline bug when the common PR is vendored in. [1] https://github.com/containers/common/pull/1146 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | podman auto-update: use report.Formatter over TemplatePaul Holzinger2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the podman command --format output code uses a mix of report.Formatter and report.Template. I patched report.Formatter to correctly handle newlines[1]. Since we cannot fix this with report.Template we have to migrate all users to report.Formatter. This ensures consistent behavior for all commands. This change does not change the output, we can add a new test for the newline bug when the common PR is vendored in. [1] https://github.com/containers/common/pull/1146 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #15779 from edsantiago/docs_dedup_publishOpenShift Merge Robot2022-09-13
|\ \ \ | | | | | | | | [CI:DOCS] Man pages: Refactor common options: --publish
| * | | Man pages: Refactor common options: --publishEd Santiago2022-09-13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Almost identical between podman-create, run, and pod-create. The "Notes" are different, so I left those duplicated between podman-create and run, and left the different one in pod-create. podman-container-restore also has --publish but it's unrelated. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #15773 from edsantiago/docs_dedup_publish_allOpenShift Merge Robot2022-09-13
|\ \ \ | | | | | | | | [CI:DOCS] Man pages: refactor common options: --publish-all
| * | | Man pages: refactor common options: --publish-allEd Santiago2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only shared between podman-create and run. The latter was updated in #5192, and that is the text I chose. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #15772 from edsantiago/autolabel_api_changeOpenShift Merge Robot2022-09-13
|\ \ \ \ | |/ / / |/| | | [CI:BUILD] Enable github labeler, use for api-change
| * | | Enable github labeler, use for api-changeEd Santiago2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Belated followup to #11829: use github labeler workflow[1] to auto-add 'kind/api-change' label to PRs in which files are touched under pkg/api [1] https://github.com/actions/labeler Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #15770 from edsantiago/docs_dedup_os.pullOpenShift Merge Robot2022-09-13
|\ \ \ \ | |/ / / |/| | | [CI:DOCS] Man pages: refactor common options: --os (pull)
| * | | Man pages: refactor common options: --os (pull)Ed Santiago2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only shared by podman-create, -pull, -run. No changes made other than whitespace, so this should be a gimme. podman-build, import, and manifest-* also have --os options, but those are unrelated and I can't find a way to combine any two of them. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #15721 from edsantiago/instrument_metacopy_flakeOpenShift Merge Robot2022-09-13
|\ \ \ \ | |/ / / |/| | | TEMPORARY: instrumenting for 15488
| * | | TEMPORARY: instrumenting for 15488Ed Santiago2022-09-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to catch the wiley metacopy flake: add a debug condition to run_podman, in system tests, to log all instances in which output includes the metacopy warning. The idea is to detect the very first time it happens, and see what is triggering it. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #15768 from edsantiago/docs_dedup_ipOpenShift Merge Robot2022-09-13
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Man pages: refactor common options: --ip
| * | | | Man pages: refactor common options: --ipEd Santiago2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Between podman-create, run, and pod-create. The big difference is that I changed 'IP' to 'IPv4' in podman-pod-create, I believe that was an oversight in #12611. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #15752 from vrothberg/fix-15691OpenShift Merge Robot2022-09-13
|\ \ \ \ \ | | | | | | | | | | | | health checks: restart timers
| * | | | | health checks: restart timersValentin Rothberg2022-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restart the health-check timers instead of starting them. This will surpress annoying errors stating that an already running timer cannot be started anymore. Also make sure that the transient units/timers are stopped and removed when stopping a container. Fixes: #15691 Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-27 10:58:42 +0000