summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| * | | | remove ARTIFACT_DIR and ArtifactPathEd Santiago2021-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...they're not actually used for anything Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | | Image caches: allow overriding cache dirEd Santiago2021-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Images were being cached in /tmp, with no option to override. Now $PODMAN_TEST_IMAGE_CACHE_DIR can be used to point to a user-preferred location. If unset, try $TMPDIR before settling on /tmp. Also: refactor the logic for determining the tarball name. Also: include registry name in tarball name. Also: clean up unused/unnecessary code Also: do not echo "Restoring..." if we're not actually restoring. Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | | Rename CrioRoot as just RootEd Santiago2021-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...and remove other uses of "crio". They're confusing and misleading. (I'm sure it made sense at one time) Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #12425 from tnk4on/remote-build-eval-containerfileOpenShift Merge Robot2021-12-02
|\ \ \ \ \ | | | | | | | | | | | | Fixed the containerfile not found during remote build
| * | | | | Fixed the containerfile not found during remote build.Shion Tanaka2021-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Shion Tanaka <shtanaka@redhat.com>
* | | | | | Merge pull request #12472 from rhatdan/ownersOpenShift Merge Robot2021-12-01
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | [CI:DOCS] Add ashley-cui, lsm5 and floutoc to owners
| * | | | | Add ashley-cui, lsm5 and floutoc to ownersDaniel J Walsh2021-12-01
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #12458 from edsantiago/remove_betrueOpenShift Merge Robot2021-12-01
|\ \ \ \ \ \ | |/ / / / / |/| | | | | e2e: yet more cleanup of BeTrue/BeFalse
| * | | | | e2e: yet more cleanup of BeTrue/BeFalseEd Santiago2021-11-30
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Thanks to Paul for teaching me about HaveKey() Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #12460 from jwhonce/issues/10974-1OpenShift Merge Robot2021-12-01
|\ \ \ \ \ | | | | | | | | | | | | [NO NEW TESTS NEEDED] Refactor podman container command output
| * | | | | [NO NEW TESTS NEEDED] Refactor podman container command outputJhon Honce2021-12-01
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leverage new report.Formatter allowing better compatibility from podman command output. See #10974 See #12455 Depends on containers/common#831 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #12307 from hshiina/device-weightOpenShift Merge Robot2021-12-01
|\ \ \ \ \ | | | | | | | | | | | | Implement 'podman run --blkio-weight-device'
| * | | | | Implement 'podman run --blkio-weight-device'Hironori Shiina2021-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `--blkio-weight-device` is not fully implemented and this causes an unexpected panic when specified because an entry is put into an uninitialized map at parsing. This fix implements the `--blkio-weight-device` and adds a system test. When creating a spec generator on a client, a major number and a minor number of a device cannot be set. So, these numbers are inspected on a server and set to a runtime spec. Signed-off-by: Hironori Shiina <shiina.hironori@jp.fujitsu.com>
* | | | | | Merge pull request #12450 from giuseppe/compression-formatOpenShift Merge Robot2021-12-01
|\ \ \ \ \ \ | | | | | | | | | | | | | | podman, push: expose --compression-format
| * | | | | | podman, push: expose --compression-formatGiuseppe Scrivano2021-12-01
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support overriding the compression format at push time. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #12464 from giuseppe/fix-race-reading-cgroup-fileOpenShift Merge Robot2021-12-01
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | container, cgroup: detect pid termination
| * | | | | container, cgroup: detect pid terminationGiuseppe Scrivano2021-12-01
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the /proc/$PID/cgroup file doesn't exist, then it is likely the container was terminated in the meanwhile so report ErrCtrStopped that is already handled instead of ENOENT. commit a66f40b4df039e94572fa38c070207a435cfa466 introduced the regression. Closes: https://github.com/containers/podman/issues/12457 [NO NEW TESTS NEEDED] it solves a race in the CI that is difficult to reproduce. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #12462 from vrothberg/fix-12452OpenShift Merge Robot2021-12-01
|\ \ \ \ \ | |/ / / / |/| | | | top: parse ps(1) args correctly
| * | | | top: parse ps(1) args correctlyValentin Rothberg2021-12-01
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The arguments of ps(1) should be shlexed. Fixes: #12452 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #12454 from edsantiago/remove_betrueOpenShift Merge Robot2021-11-30
|\ \ \ \ | | | | | | | | | | More BeTrue cleanup
| * | | | a few more manual BeTrue cleanupsEd Santiago2021-11-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | | Convert strings.Contains() to Expect(ContainSubstring)Ed Santiago2021-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...done manually, not via sed, because some of the inner expressions include nested commas. Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | | e2e tests: more cleanup of BeTrue()sEd Santiago2021-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write a BeValidJSON() matcher, and replace IsJSONOutputValid(): sed -i -e 's/Expect(\(.*\)\.IsJSONOutputValid()).To(BeTrue())/Expect(\1.OutputToString())\.To(BeValidJSON())/' test/e2e/*_test.go (Plus a few manual tweaks) Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #12414 from flouthoc/api-allow-secretsOpenShift Merge Robot2021-11-30
|\ \ \ \ \ | |/ / / / |/| | | | tunnel: allow `remote` and `API` to accept `--secrets`
| * | | | podman-remote: prevent leaking secret into imageAditya Rajan2021-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents temp secrets leaking into image by moving it away from context directory to parent builder directory. Builder directory automatically gets cleaned up when we are done with the build. Signed-off-by: Aditya Rajan <arajan@redhat.com>
| * | | | podman-remote: copy secret to contextdir is absolute path on hostAditya Rajan2021-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman remote must treat build secrets as part of context directory. If secret path is absolute path on host copy it to tar file and pass it to remote server. Signed-off-by: Aditya Rajan <arajan@redhat.com>
| * | | | api: allow build api to accept secretsAditya Rajan2021-11-30
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following commit makes sure that `build` api can accept external secret and allows currently `NOOP` `podman-remote build -t tag --secret id=mysecret,src=/path/on/remote` to become functional. Just like `docker` following api is a hidden field and only exposed to `podman-remote` but could document it if it needs exposed on `swagger`. Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | | | Merge pull request #12449 from vrothberg/fix-12438OpenShift Merge Robot2021-11-30
|\ \ \ \ | | | | | | | | | | systemd: replace multi-user with default.target
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-07 11:19:19 +0000