summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #12487 from jwhonce/issues/10974-2OpenShift Merge Robot2021-12-06
|\ | | | | Refactor podman system to report.Formatter
| * Refactor podman system to report.FormatterJhon Honce2021-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Support better compatibility output for podman system commands * Format and content of output from podman version changed to be more compatible See #10974 Depends on containers/common#831 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | Merge pull request #12514 from vrothberg/vendor-commonOpenShift Merge Robot2021-12-06
|\ \ | | | | | | vendor c/common@main
| * | vendor c/common@mainValentin Rothberg2021-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update the `--filter reference=...` tests to reflect recent changes in c/common. The reference values now match as specified without implicitly adding wildcards arounds. Fixes: #11905 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #12511 from n1hility/fix-win-pathOpenShift Merge Robot2021-12-06
|\ \ \ | |/ / |/| | Fixes #11416 - Trailing quote on PATH added by Windows MSI
| * | Escape trailing slash in install directory location so the closing quote is ↵Jason T. Greene2021-12-05
|/ / | | | | | | | | | | | | | | not escaped Fixes #11416 [NO NEW TESTS NEEDED] Signed-off-by: Jason Greene <jason.greene@redhat.com>
* | Merge pull request #12500 from lsm5/auto-copr3OpenShift Merge Robot2021-12-04
|\ \ | | | | | | centos 9 stream cannot use %autochangelog
| * | centos 9 stream cannot use %autochangelogLokesh Mandvekar2021-12-03
|/ / | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | Merge pull request #12491 from lsm5/auto-coprOpenShift Merge Robot2021-12-03
|\ \ | | | | | | add spec file for automated copr builds
| * | add spec file for automated copr buildsLokesh Mandvekar2021-12-03
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit along with an upstream webhook will automatically build an rpm at `rhcontainerbot/podman-next` . RPM NVR will be of the form: podman-4-$DATESTAMP.$TIMESTAMP The date and time stamps will reflect the date and time at which they were built in the COPR env which shouldn't lag the PR merge date by a lot. [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | Merge pull request #12466 from ↵OpenShift Merge Robot2021-12-03
|\ \ | |/ |/| | | | | dispensable/respect_pod_yaml_spec_hostname_when_play Hostname in `spec.hostname` should be passed to infra ctr init opt
| * Hostname in `spec.hostname` should be passed to infra ctr init optwangqiang2021-12-01
| | | | | | | | | | | | Fixes https://github.com/containers/podman/issues/12393 Signed-off-by: Qiang Wang <sunsetmask@gmail.com>
* | Merge pull request #12489 from mtrmac/save-me-from-repetitionOpenShift Merge Robot2021-12-03
|\ \ | | | | | | Improve documentation of (podman image save)
| * | Fix documentation of (podman image save --compress --uncompressed)Miloslav Trmač2021-12-02
| | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | Improve documentation of (podman image save --format)Miloslav Trmač2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | - Don't pointlessly repeat the names - Improve documentation of the formats - Use a table, per MANPAGE_SYNTAX.md Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | Merge pull request #12440 from umohnani8/cmOpenShift Merge Robot2021-12-03
|\ \ \ | | | | | | | | Add support for configmap volumes to play kube
| * | | Add support for configmap volumes to play kubeUrvashi Mohnani2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the k8s yaml has volumes from a configmap, play kube will now create a volume based on the data from the configmap and volume source and set it to the right path in the container accordingly. Add tests for this and update some test for ENV from configmap. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | | Merge pull request #12360 from rhatdan/VENDOROpenShift Merge Robot2021-12-03
|\ \ \ \ | | | | | | | | | | Bump storage
| * | | | UPdate vendor of image-spec and containers/storageDaniel J Walsh2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should get rid of the nasty warning on the github site. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #12484 from machacekondra/restartSecOpenShift Merge Robot2021-12-03
|\ \ \ \ \ | | | | | | | | | | | | Add restart-sec option to systemd generate command
| * | | | | Add restart-sec option to systemd generateOndra Machacek2021-12-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ondra Machacek <omachace@redhat.com>
* | | | | | Merge pull request #12486 from giuseppe/use-configured-compression-formatOpenShift Merge Robot2021-12-03
|\ \ \ \ \ \ | |/ / / / / |/| | | | | cmd, push: use the configured compression format
| * | | | | cmd, push: use the configured compression formatGiuseppe Scrivano2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] I am just changing the default value Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | vendor: update containers/commonGiuseppe Scrivano2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #12488 from edsantiago/logformatter_fixesOpenShift Merge Robot2021-12-03
|\ \ \ \ \ \ | | | | | | | | | | | | | | [CI:DOCS] logformatter: fix corner case with links
| * | | | | | [CI:DOCS] logformatter: fix corner case with linksEd Santiago2021-12-02
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A test name beginning with non-alpha, e.g., "--build should ...", was not being recognized and linkified: https://storage.googleapis.com/cirrus-ci-6707778565701632-fcae48/artifacts/containers/podman/6500723916537856/html/int-podman-fedora-34-rootless-host.log.html Fix that. Also fix two other cases (single/double quotes) that were resulting in weird unreliable links. While I'm at it, add a few usability enhancements: * Colorize [SKIPPING] and [SLOW TEST] * Deemphasize '[It] testname' when it appears mid-test * Replace 'Running:' with a (deemphasized) '#' or '$' prompt Add regression tests Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | Merge pull request #12483 from vrothberg/fix-12468OpenShift Merge Robot2021-12-02
|\ \ \ \ \ \ | |/ / / / / |/| | | | | compat API: push: report size of manifest
| * | | | | compat API: push: report size of manifestDaniel J Walsh2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't yet have a local registry running in the APIv2 tests. Tested manually. [NO NEW TESTS NEEDED] Fixes: https://github.com/containers/podman/issues/12468 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | Merge pull request #12482 from edsantiago/e2e_haveOpenShift Merge Robot2021-12-02
|\ \ \ \ \ \ | | | | | | | | | | | | | | e2e tests: use HaveKey() and HaveLen() when possible
| * | | | | | Manual fixesEd Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a handful of instances not covered by earlier automated replacements. Found via: ack 'Expect\(len' test/e2e There are still a bunch of BeNumerically(">", ...) that cannot (yet) be handled by HaveLen(). Leave those as they are. Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | | | | Same thing, with BeNumerically("==", x)Ed Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sed -i -e 's/Expect(len(\(.*\)))\.To(BeNumerically("==", \(.*\)))/Expect(\1).To(HaveLen(\2))/' test/e2e/*.go Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | | | | Use HaveLen(x) instead of Expect(len(y)).To(Equal(x))Ed Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sed -i -e 's/Expect(len(\(.*\)))\.To(Equal(\(.*\)))/Expect(\1).To(HaveLen(\2))/' test/e2e/*.go Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | | | | Same thing, for BeNumerically("==", 0)Ed Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sed -i -e 's/Expect(len(\(.*\)))\.To(BeNumerically("==", 0))/Expect(\1).To(BeEmpty())/' test/e2e/*.go Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | | | | Use BeEmpty() instead of len(x).To(Equal(0))Ed Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sed -i -e 's/Expect(len(\(.*\)))\.To(Equal(0))/Expect(\1).To(BeEmpty())/' test/e2e/*.go Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | | | | Same as previous, for assertions other than Equal()Ed Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sed -i -e 's/Expect(\(.*\)\[\(\".*\"\)\])\.To(\(.*\)/Expect(\1).To(HaveKeyWithValue(\2, \3)/' test/e2e/*_test.go Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | | | | e2e tests: a little more minor cleanupEd Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sed -i -e 's/Expect(\(.*\)\[\(\".*\"\)\])\.To(Equal(/Expect(\1).To(HaveKeyWithValue(\2, /' test/e2e/*_test.go ...with two manual tweaks, because this converted: Expect(foo["bar"]).To(Equal("")) -> Expect(foo).To(HaveKeyWithValue("bar","")) It looks like the intention of the test was, instead: ...To(Not(HaveKey("bar"))) Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | | Merge pull request #12445 from wilbeibi/mainOpenShift Merge Robot2021-12-02
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [CI:DOCS] Update doc to explictly mention using ed25519 in ssh keys
| * | | | | | | Update doc to explictly mention using ed25519 in ssh keysHongyi Shen2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hongyi Shen <wilbeibi@gmail.com>
* | | | | | | | Merge pull request #12365 from mtrmac/randomOpenShift Merge Robot2021-12-02
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Don't use a global RNG, and avoid conflicts, when generating NodePorts
| * | | | | | | Ensure the generated NodePort values are uniqueMiloslav Trmač2021-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... at least within a single service. [NO NEW TESTS NEEDED] because testing RNGs is problematic. (We _could_ probably inject a mock RNG implementation that always returns the same value, or something like that.) Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | | | | | | Allow containerPortsToServicePorts to failMiloslav Trmač2021-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an error return to it and affected callers. Should not affect behavior, the function can't currently fail. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | | | | | | Don't use the global math/rand RNG for service portsMiloslav Trmač2021-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a private RNG with the desired seed, don't interfere with the other uses. Introducing the servicePortState type is rather overkill for the single member, but we'll add another one immediately. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | | | | | | Move a comment to the relevant placeMiloslav Trmač2021-11-30
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | | | | Merge pull request #12455 from jwhonce/issues/10974OpenShift Merge Robot2021-12-02
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor podman image command output
| * | | | | | | Refactor podman image command outputJhon Honce2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leverage new report.Formatter allowing better compatibility from podman command output. Follow on PR's will cover containers, etc. See #10974 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | | | | Merge pull request #12480 from vrothberg/fix-12453OpenShift Merge Robot2021-12-02
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | compat: images/json
| * | | | | | | | compat: images/jsonValentin Rothberg2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not list manifest lists. Docker doesn't either. Fixes: #12453 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | | | | Merge pull request #12469 from Luap99/ns-teardown-flakeOpenShift Merge Robot2021-12-02
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Fix possible rootless netns cleanup race
| * | | | | | | | Fix possible rootless netns cleanup racePaul Holzinger2021-12-01
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rootlessNetNS.Cleanup() has an issue with how it detects if cleanup is needed, reading the container state is not good ebough because containers are first stopped and than cleanup will be called. So at one time two containers could wait for cleanup but the second one will fail because the first one triggered already the cleanup thus making rootless netns unavailable for the second container resulting in an teardown error. Instead of checking the container state we need to check the netns state. Secondly, podman unshare --rootless-netns should not do the cleanup. This causes more issues than it is worth fixing. Users also might want to use this to setup the namespace in a special way. If unshare also cleans this up right away we cannot do this. [NO NEW TESTS NEEDED] Fixes #12459 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | | | | | Merge pull request #12471 from edsantiago/e2e_tmpdir_cleanupOpenShift Merge Robot2021-12-02
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | e2e tmpdir cleanup