summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Support env variables based on ConfigMaps sent in payloadJakub Dzon2021-11-23
| | | | | | Fixes #12363 Signed-off-by: Jakub Dzon <jdzon@redhat.com>
* Merge pull request #12380 from vrothberg/fix-11618OpenShift Merge Robot2021-11-23
|\ | | | | generate systemd: add --start-timeout flag
| * generate systemd: add --start-timeout flagValentin Rothberg2021-11-23
| | | | | | | | | | | | | | | | | | Add a new flag to set the start timeout for a generated systemd unit. To make naming consistent, add a new --stop-timeout flag as well and let the previous --time map to it. Fixes: #11618 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #12387 from edsantiago/remove_betrueOpenShift Merge Robot2021-11-23
|\ \ | |/ |/| e2e tests: clean up antihelpful BeTrue()s
| * Oops! Manual edits to broken testsEd Santiago2021-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 2 of 2: there were (still are?) a bunch of string checks that didn't have a corresponding Expect(). IIUC that means they were NOPs. Try to identify and fix those. The first few were caught by Go linting, "ok is defined but not used". When I realized the problem, I looked for more using: $ ack -A2 LineInOutputStartsWith ...and tediously eyeballing the results, looking for matches in which the next line was not Expect(). If test was wrong (e.g. "server" should've been "nameserver"), fix that. Also: remove the remove-betrue script. We don't need it in the repo, I just wanted to preserve it for posterity. Signed-off-by: Ed Santiago <santiago@redhat.com>
| * e2e tests: clean up antihelpful BeTrue()sEd Santiago2021-11-22
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | Many ginkgo tests have been written to use this evil form: GrepString("foo") Expect(that to BeTrue()) ...which yields horrible useless messages on failure: false is not true Identify those (automatically, via script) and convert to: Expect(output to ContainSubstring("foo")) ...which yields: "this output" does not contain substring "foo" There are still many BeTrue()s left. This is just a start. This is commit 1 of 2. It includes the script I used, and all changes to *.go are those computed by the script. Commit 2 will apply some manual fixes. Signed-off-by: Ed Santiago <santiago@redhat.com>
* Merge pull request #12389 from cevich/remove_staticOpenShift Merge Robot2021-11-22
|\ | | | | [CI:DOCS] Cirrus: Strip out static nix build
| * Cirrus: Strip out static nix buildChris Evich2021-11-22
| | | | | | | | | | | | Unfortunately the maintainer of this is no longer available Signed-off-by: Chris Evich <cevich@redhat.com>
* | Merge pull request #12386 from baude/playkuberenameDaniel J Walsh2021-11-22
|\ \ | | | | | | Rename pod on generate of container
| * | Rename pod on generate of containerBrent Baude2021-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | When generating kube of a container, the podname and container name in the yaml are identical. This offends rules in podman where pods and containers cannot have the same name. We now append _pod to the podname to avoid that collision. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #12352 from Luap99/netavark-errDaniel J Walsh2021-11-22
|\ \ \ | | | | | | | | Fix netavark error handling and teardown issue
| * | | Fix netavark error handling and teardown issuePaul Holzinger2021-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The return error was not returned by podman , instead a different error was created. Also make sure to free assigned ips on an error to not leak them. Lastly podman container cleanup uses the default network backend instead of the provided one, we need to add `--network-backend` to the exit command. [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | Merge pull request #12301 from umohnani8/tableOpenShift Merge Robot2021-11-22
|\ \ \ \ | |_|_|/ |/| | | Add note about volume with unprivileged container
| * | | Add note about volume with unprivileged containerUrvashi Mohnani2021-11-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note to the generated kube yaml if we detect a volume is being mounted. The note lets the user know what needs to be done to avoid permission denied error when trying to access the volume for an unprivileged container. Add the same note to the man pages. NO NEW TESTS NEEDED Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | | Merge pull request #12384 from ↵Daniel J Walsh2021-11-22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/image/v5-5.17.0 Bump github.com/containers/image/v5 from 5.16.1 to 5.17.0
| * | | | Bump github.com/containers/image/v5 from 5.16.1 to 5.17.0dependabot[bot]2021-11-22
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/image/v5](https://github.com/containers/image) from 5.16.1 to 5.17.0. - [Release notes](https://github.com/containers/image/releases) - [Commits](https://github.com/containers/image/compare/v5.16.1...v5.17.0) --- updated-dependencies: - dependency-name: github.com/containers/image/v5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | Merge pull request #12385 from umohnani8/docsOpenShift Merge Robot2021-11-22
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Update notes on java TZ in man page
| * | | | [CI:DOCS] Update notes on java TZ in man pageUrvashi Mohnani2021-11-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | | | Merge pull request #12381 from flouthoc/build-layer-docker-compatOpenShift Merge Robot2021-11-22
|\ \ \ \ \ | |/ / / / |/| | | | compat: add layer caching compatiblity for `non-podman` clients.
| * | | | swagger: add layers to build api docsAditya Rajan2021-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing `layer` entry to swagger docs for `/build`. Signed-off-by: Aditya Rajan <arajan@redhat.com>
| * | | | compat: add layer caching compatiblity for non podman clientsAditya Rajan2021-11-22
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-podman clients do not set `layers` while making request. This is supposed to be `true` bydefault but `non-podman-clients i.e Docker` dont know about this field as a result they end up setting this values to `false`. Causing builds to never use cache for layers. Adds compatiblity for `docker SDK`. [NO NEW TESTS NEEDED] Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | | | Merge pull request #12373 from TomSweeneyRedHat/dev/tsweeney/jdocOpenShift Merge Robot2021-11-22
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Add java TZ note to run manpage
| * | | | [CI:DOCS] Add java TZ note to run manpageTomSweeneyRedHat2021-11-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note to show how to workaround the `--tz` option being ignored in the run command. Related to: https://bugzilla.redhat.com/show_bug.cgi?id=1984251 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | Merge pull request #12382 from ↵Daniel J Walsh2021-11-22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/opencontainers/selinux-1.10.0 Bump github.com/opencontainers/selinux from 1.9.1 to 1.10.0
| * | | | | Bump github.com/opencontainers/selinux from 1.9.1 to 1.10.0dependabot[bot]2021-11-22
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/opencontainers/selinux](https://github.com/opencontainers/selinux) from 1.9.1 to 1.10.0. - [Release notes](https://github.com/opencontainers/selinux/releases) - [Commits](https://github.com/opencontainers/selinux/compare/v1.9.1...v1.10.0) --- updated-dependencies: - dependency-name: github.com/opencontainers/selinux dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | | Merge pull request #12349 from edsantiago/clean_fixmesOpenShift Merge Robot2021-11-22
|\ \ \ \ \ | |_|_|/ / |/| | | | Semiperiodic cleanup of obsolete Skip()s
| * | | | Semiperiodic cleanup of obsolete Skip()sEd Santiago2021-11-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found by my find-obsolete-skips script. Let's see which, if any, of these skipped tests can be reenabled. Some Skips are "this will never work", not "this is expected to work one day". Update the message on those to reflect that. Some were real bugs in the test framework. Fix those. And, joy of joys, some work today. Remove those skips. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #12372 from Luap99/syslog-netavarkOpenShift Merge Robot2021-11-22
|\ \ \ \ \ | |_|_|_|/ |/| | | | Make sure netavark output is logged to the syslog
| * | | | Force iptables driver for netavark testsPaul Holzinger2021-11-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firewalld cannot be used because it can connect to the dbus api but talks to firewalld in the host namespace. This will affact your host badly and also causes tests to fail. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | | | Make sure netavark output is logged to the syslogPaul Holzinger2021-11-19
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Create a custom writer which logs the netavark output to logrus. This will log to the syslog when it is enabled. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | Merge pull request #12351 from ↵OpenShift Merge Robot2021-11-22
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | adrianreber/2021-11-18-restore-runtime-verification Restore runtime verification
| * | | Add tests for restore runtime verificationAdrian Reber2021-11-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On container restore ensures that the same container runtime is used as during checkpointing and it also ensures that the user does not select a different runtime. Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | Use same runtime to restore a container as during checkpointingAdrian Reber2021-11-19
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are at least two runtimes that support checkpoint and restore: runc and crun. Although the checkpoints created by these are almost compatible, it is not (yet) possible to restore a checkpoint created with one runtime with the other runtime. To make checkpoint/restore usage more comfortable this adds code to look into the checkpoint archive during restore and to set the runtime to the one used during checkpointing. This also adds a check, if the user explicitly sets a runtime during restore, that the runtime is also the same as used during checkpointing. If a different runtime is selected than the one used during checkpointing the restore will fail early. If runc and crun will create compatible checkpoints in the future the check can be changed to treat crun and runc as compatible checkpoint/restore runtimes. Signed-off-by: Adrian Reber <areber@redhat.com>
* | | Merge pull request #12305 from colinbendell/add-expose-port-rangeOpenShift Merge Robot2021-11-21
|\ \ \ | | | | | | | | Support EXPOSE with port ranges
| * | | Add EXPOSE e2e testColin Bendell2021-11-20
| | | | | | | | | | | | | | | | Signed-off-by: Colin Bendell <colin@bendell.ca>
| * | | Support EXPOSE with port rangesColin Bendell2021-11-20
|/ / / | | | | | | | | | | | | | | | | | | | | | Fixes issue #12293. EXPOSE directive in images should mirror the --expose parameter. Specifically `EXPOSE 20000-20100/tcp` should work the same as `--expose 20000-20100/tcp` Signed-off-by: Colin Bendell <colin@bendell.ca>
* | | Merge pull request #12216 from ↵OpenShift Merge Robot2021-11-20
|\ \ \ | |_|/ |/| | | | | | | | containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.14.6 Bump github.com/rootless-containers/rootlesskit from 0.14.5 to 0.14.6
| * | Bump github.com/rootless-containers/rootlesskit from 0.14.5 to 0.14.6Daniel J Walsh2021-11-19
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/rootless-containers/rootlesskit](https://github.com/rootless-containers/rootlesskit) from 0.14.5 to 0.14.6. - [Release notes](https://github.com/rootless-containers/rootlesskit/releases) - [Commits](rootless-containers/rootlesskit@v0.14.5...v0.14.6) --- 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>
* | Merge pull request #12364 from flouthoc/fix-filter-patternOpenShift Merge Robot2021-11-19
|\ \ | |/ |/| filter: use `filepath.Match` to maintain consistency with other pattern matching in podman
| * filter: use filepath.Match to maintain consistency with other patternAditya Rajan2021-11-19
|/ | | | | | | | | | | | | | | matching in podman Following commit ensures that we maintain consistency with how pattern matching is being carried out everywhere else in podman. Switch from `regexp` to `filepath.Match` For example https://github.com/containers/common/blob/main/libimage/filters.go#L162 [NO NEW TESTS NEEDED] Signed-off-by: Aditya Rajan <arajan@redhat.com>
* Merge pull request #12367 from rst0git/file-locks-1OpenShift Merge Robot2021-11-19
|\ | | | | test: Update error string for --file-locks test
| * api/handlers: Add checkpoint/restore FileLocksRadostin Stoyanov2021-11-19
| | | | | | | | Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
| * test: Update error string for --file-locks testRadostin Stoyanov2021-11-19
| | | | | | | | | | | | | | | | Use a substring matching the end of the error message. Closes: #12366 Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
* | Merge pull request #12311 from of2x/patch-1OpenShift Merge Robot2021-11-19
|\ \ | | | | | | [CI:DOCS] upload a translation file
| * | [CI:DOCS]upload a translation file二氟化氧2021-11-19
| | | | | | | | | | | | | | | | | | a tranlastion for the podman_tutorial.md Signed-off-by: sixways <lw.2675@qq.com>
* | | Merge pull request #12174 from ↵OpenShift Merge Robot2021-11-19
|\ \ \ | | | | | | | | | | | | | | | | fgimenez/fix-docker-networksettings-type-discrepancy Introduces Address type to be used in secondary IPv4 and IPv6 inspect data structure
| * | | Introduce Address type to be used in secondary IPv4 and IPv6 inspect dataFederico Gimenez2021-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structure. Resolves a discrepancy between the types used in inspect for docker and podman. This causes a panic when using the docker client against podman when the secondary IP fields in the `NetworkSettings` inspect field are populated. Fixes containers#12165 Signed-off-by: Federico Gimenez <fgimenez@redhat.com>
* | | | Merge pull request #12356 from Luap99/pod-logsOpenShift Merge Robot2021-11-19
|\ \ \ \ | |_|_|/ |/| | | fix duplicated logs command
| * | | fix duplicated logs commandPaul Holzinger2021-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman logs was defined twice, once for container logs and once for pod logs. This causes problems with the shell completion. Also podman --help showed this command twice. [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | Merge pull request #12344 from ↵OpenShift Merge Robot2021-11-19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/docker/docker-20.10.11incompatible Bump github.com/docker/docker from 20.10.10+incompatible to 20.10.11+incompatible