summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* fix logic when not creating a workdirValentin Rothberg2021-02-05
| | | | | | | | | | | When resolving the workdir of a container, we may need to create unless the user set it explicitly on the command line. Otherwise, we just do a presence check. Unfortunately, there was a missing return that lead us to fall through into attempting to create and chown the workdir. That caused a regression when running on a read-only root fs. Fixes: #9230 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #9188 from jwhonce/issues/8865OpenShift Merge Robot2021-02-03
|\ | | | | Report StatusConflict on Pod opt partial failures
| * Report StatusConflict on Pod opt partial failuresJhon Honce2021-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When one or more containers in the Pod reports an error on an operation report StatusConflict and report the error(s) - jsoniter type encoding used to marshal error as string using error.Error() - Update test framework to allow setting any flag when creating pods - Fix test_resize() result check Fixes #8865 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | Merge pull request #9217 from vrothberg/attach-warnOpenShift Merge Robot2021-02-03
|\ \ | | | | | | bindings: attach: warn correct error
| * | bindings: attach: warn correct errorValentin Rothberg2021-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | The resize warning logged the wrong error. While this does not fix #9172, it may very well be helpful finding its root cause. [NO TESTS NEEDED] Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #9216 from ↵OpenShift Merge Robot2021-02-03
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/storage-1.25.0 Bump github.com/containers/storage from 1.24.5 to 1.25.0
| * | | Bump github.com/containers/storage from 1.24.5 to 1.25.0dependabot-preview[bot]2021-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.24.5 to 1.25.0. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.24.5...v1.25.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #9215 from ↵OpenShift Merge Robot2021-02-03
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containernetworking/cni-0.8.1 Bump github.com/containernetworking/cni from 0.8.0 to 0.8.1
| * | | | Bump github.com/containernetworking/cni from 0.8.0 to 0.8.1dependabot-preview[bot]2021-02-03
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containernetworking/cni](https://github.com/containernetworking/cni) from 0.8.0 to 0.8.1. - [Release notes](https://github.com/containernetworking/cni/releases) - [Commits](https://github.com/containernetworking/cni/compare/v0.8.0...v0.8.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #9208 from edsantiago/batsOpenShift Merge Robot2021-02-03
|\ \ \ \ | | | | | | | | | | System test for #9096 (truncated stdout)
| * | | | System test for #9096 (truncated stdout)Ed Santiago2021-02-02
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This actually tests conmon, not podman; but that's the whole point of system tests in the first place: if a problem exists, we want to fail loudly, no matter whose fault it is. (I can't get this to fail on my f33 laptop; OP on #9096 claims it only fails on Ubuntu. We'll see what happens in CI). Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #9214 from rhatdan/waitOpenShift Merge Robot2021-02-03
|\ \ \ \ | | | | | | | | | | Fix invalid wait condition on kill
| * | | | Fix invalid wait condition on killDaniel J Walsh2021-02-03
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the compatability tests on kill, the kill function goes into an infinite wait loop taking all of the CPU. This change will use the correct wait function and exit properly. Fixes: https://github.com/containers/podman/issues/9206 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #9210 from edsantiago/makefile_fixesOpenShift Merge Robot2021-02-03
|\ \ \ \ | |/ / / |/| | | Makefile: make bin/* real targets!
| * | | Makefile: make bin/* real targets!Ed Santiago2021-02-03
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backstory: every time you run 'make podman' or even just 'make', you get a full recompile. This is sub-ideal. Cause: I don't really know. It looks complicated. #5017 introduced a .PHONY for bin/podman, for reasons not explained in the PR. Then, much later, #5880 well- intentionedly but improperly tweaked the 'find' command used in defining SOURCES, adding a -prune but without the corresponding and required -print. Let's just say, it was an unfortunate cascade of events. This PR fixes the SOURCES definition and removes the highly-undesired .PHONY from podman & podman-remote, making it so you can type 'make' and, oh joy, not build anything if it's current. The way 'make' is supposed to work. Why fix this now? Because my PR (#9209) was failing in CI, in the Validate step: Can't exec "./bin/podman": No such file or directory at hack/xref-helpmsgs-manpages line 223. It failed even on Re-run, and only passed once I force-pushed the PR (with no changes, just a new commit SHA). I have no idea why bin/podman wasn't built, and I have zero interest in pursuing that right now, but the proper solution is to add bin/podman as a Makefile dependency for that particular test. So done. While I'm at it, fix what is pretty clearly a typo in a .PHONY And, finally, fix a go-md2man warning introduced in #9189 [NO TESTS NEEDED] Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #9197 from ↵OpenShift Merge Robot2021-02-03
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/onsi/gomega-1.10.5 Bump github.com/onsi/gomega from 1.10.4 to 1.10.5
| * | | Bump github.com/onsi/gomega from 1.10.4 to 1.10.5dependabot-preview[bot]2021-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.10.4 to 1.10.5. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.10.4...v1.10.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #9103 from mattcen/patch-1OpenShift Merge Robot2021-02-03
|\ \ \ \ | | | | | | | | | | [CI:DOCS] typo
| * | | | typoMatthew Cengia2021-02-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Cengia <mattcen@mattcen.com>
* | | | | Merge pull request #9174 from bitstrings/masterOpenShift Merge Robot2021-02-03
|\ \ \ \ \ | | | | | | | | | | | | Make slirp MTU configurable (network_cmd_options)
| * | | | | Make slirp MTU configurable (network_cmd_options)bitstrings2021-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mtu default value is currently forced to 65520. This let the user control it using the config key network_cmd_options, i.e.: network_cmd_options=["mtu=9000"] Signed-off-by: bitstrings <pino.silvaggio@gmail.com>
* | | | | | Merge pull request #9209 from edsantiago/bats_diff_workaroundOpenShift Merge Robot2021-02-03
|\ \ \ \ \ \ | | | | | | | | | | | | | | Gating tests: diff test: workaround for RHEL8 failure
| * | | | | | Gating tests: diff test: workaround for RHEL8 failureEd Santiago2021-02-02
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RHEL8 rootless gating tests are inconsistently failing with: $ podman diff --format json -l # {"changed":["/etc"],"added":["/sys/fs","/sys/fs/cgroup","/pMOm1Q0fnN"],"deleted":["/etc/services"]} # #/vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv # #| FAIL: added # #| expected: '/pMOm1Q0fnN' # #| actual: '/sys/fs' # #| > '/sys/fs/cgroup' # #| > '/pMOm1Q0fnN' # #\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Reason: PR #8561, I think (something to do with /sys on RHEL). Workaround: ignore '/sys/fs' in diffs. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | Merge pull request #9204 from baude/macvlanextraOpenShift Merge Robot2021-02-03
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Honor network options for macvlan networks
| * | | | | Honor network options for macvlan networksbaude2021-02-02
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when creating a macvlan network, we should honor gateway, subnet, and mtu as provided by the user. Fixes: #9167 Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #9203 from matejvasek/improve_param_serder_generatorOpenShift Merge Robot2021-02-03
|\ \ \ \ \ | |_|/ / / |/| | | | [NO TESTS NEEDED] Improve binding generator
| * | | | [NO TESTS NEEDED] style: indendationMatej Vasek2021-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
| * | | | [NO TESTS NEEDED] fixup: remove debug codeMatej Vasek2021-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
| * | | | [NO TESTS NEEDED] Generated filesMatej Vasek2021-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
| * | | | [NO TESTS NEEDED] Improve generatorMatej Vasek2021-02-02
| |/ / / | | | | | | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | | | Merge pull request #9200 from edsantiago/make_ginkgo_refactorOpenShift Merge Robot2021-02-02
|\ \ \ \ | | | | | | | | | | Makefile: refactor ginkgo * ginkgo-remote
| * | | | Makefile: refactor ginkgo * ginkgo-remoteEd Santiago2021-02-02
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new common target, ginkgo-run, with the main ginkgo test incantation; ginkgo and ginkgo-remote now invoke that, with a clearer distinction between their arguments. Reason for this: 'make remoteintegration' was not generating ginkgo logs in CI. Reason: '-debug' option was missing from the ginkgo incantation. Reason: impossibility of maintaining duplicate long-complicated lines. This PR distills the common aspects, making the differences clearer between local & remote. IMPORTANT NOTE: '-nodes 3' was also missing from remote ginkgo. This PR adds it. If this was intentionally omitted, please let me know (with reasons) so I can refactor that too. [NO TESTS NEEDED] Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #9185 from mheon/pod_no_networkOpenShift Merge Robot2021-02-02
|\ \ \ \ | | | | | | | | | | Allow pods to use --net=none
| * | | | Allow pods to use --net=noneMatthew Heon2021-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need an extra field in the pod infra container config. We may want to reevaluate that struct at some point, as storing network modes as bools will rapidly become unsustainable, but that's a discussion for another time. Otherwise, straightforward plumbing. Fixes #9165 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #9116 from iwita/ls-volumes-before-pruningOpenShift Merge Robot2021-02-02
|\ \ \ \ \ | |_|/ / / |/| | | | List volumes before pruning
| * | | | list volumes before pruningAchilleas Tzenetopoulos2021-01-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Achilleas Tzenetopoulos <atzenetopoulos@gmail.com>
* | | | | Merge pull request #9195 from ↵OpenShift Merge Robot2021-02-02
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/onsi/ginkgo-1.15.0 Bump github.com/onsi/ginkgo from 1.14.2 to 1.15.0
| * | | | | Bump github.com/onsi/ginkgo from 1.14.2 to 1.15.0dependabot-preview[bot]2021-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/onsi/ginkgo](https://github.com/onsi/ginkgo) from 1.14.2 to 1.15.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v1.14.2...v1.15.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #9192 from mheon/release_notes_300OpenShift Merge Robot2021-02-02
|\ \ \ \ \ \ | | | | | | | | | | | | | | [CI:DOCS] Update release notes for v3.0.0
| * | | | | | Update release notes for v3.0.0Matthew Heon2021-02-01
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | Merge pull request #9189 from baude/macvlandriverOpenShift Merge Robot2021-02-02
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | add macvlan as a supported network driver
| * | | | | add macvlan as a supported network driverbaude2021-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of using the --macvlan to indicate that you want to make a macvlan network, podman network create now honors the driver name of *macvlan*. Any options to macvlan, like the parent device, should be specified as a -o option. For example, -o parent=eth0. the --macvlan option was marked as deprecated in the man page but is still supported for the duration of 3.0. Signed-off-by: baude <bbaude@redhat.com>
* | | | | | Merge pull request #9190 from edsantiago/make_completionsOpenShift Merge Robot2021-02-01
|\ \ \ \ \ \ | | | | | | | | | | | | | | New 'make completions' target
| * | | | | | New 'make completions' targetEd Santiago2021-02-01
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate shell completion files for podman and podman-remote and for all known shells (bash, fish, zsh). Fix Readme file in completions dir: it suggested running 'make completion', singular; no such target existed. Since the install target is plural, I choose to make the new target plural also. This is intended for use in CI some day, in a check such as: (in contrib/cirrus/runner.sh): make completions SUGGESTION="run 'make completions' and commit all changes" ./hack/tree_status.sh The goal would be to make sure that any new podman subcommands or flags are accompanied by their corresponding shell helpers on all commits. IT IS NOT POSSIBLE TO ENFORCE THIS NOW. As I understand it, Cobra is slow to incorporate community PRs, so the podman team has chosen to sneak in completion files generated by an unreleased and un-vendored version of Cobra. Running 'make completions' right now would clobber those and result in a diminished user experience. I'm submitting this anyway as a stepping-stone toward that future day when we can create such a CI hook. [NO TESTS NEEDED] Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | Merge pull request #9177 from ↵OpenShift Merge Robot2021-02-01
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.13.0 Bump github.com/rootless-containers/rootlesskit from 0.12.0 to 0.13.0
| * | | | | Bump github.com/rootless-containers/rootlesskit from 0.12.0 to 0.13.0dependabot-preview[bot]2021-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/rootless-containers/rootlesskit](https://github.com/rootless-containers/rootlesskit) from 0.12.0 to 0.13.0. - [Release notes](https://github.com/rootless-containers/rootlesskit/releases) - [Commits](https://github.com/rootless-containers/rootlesskit/compare/v0.12.0...v0.13.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #9178 from Luap99/fix-9176OpenShift Merge Robot2021-02-01
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix podman generate systemd --new special char handling
| * | | | | Fix podman generate systemd --new special char handlingPaul Holzinger2021-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a systemd unit dollar and percent signs are used for variables. A backslash is used for escape sequences. If any of these characters are used in the create command we have to properly escape them so systemd does not try to interpret them. Fixes #9176 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | | Merge pull request #9168 from Luap99/fix-pod-create-network-parsingOpenShift Merge Robot2021-02-01
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix --network parsing for podman pod create
| * | | | | | Fix --network parsing for podman pod createPaul Holzinger2021-01-31
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `--network` flag is parsed differently for `podman pod create`. This causes confusion and problems for users. The extra parsing logic ignored unsupported network options such as `none`, `container:...` and `ns:...` and instead interpreted them as cni network names. Tests are added to ensure the correct errors are shown. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>