summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Cirrus: Guarantee $DEST_BRANCH is passed throughChris Evich2022-05-10
| | | | | | | | | | | | | There are several runtime contexts (rootless and container) where `$DEST_BRANCH` is needed but was not supplied. A prior commit (c4865767171b) removed the default value, `main` which was being set incorrectly when CI ran on release branches. Fix this by ensuring the variable is non-empty upon entry to `setup_environment.sh`, then ensure it gets passed through to child environments by way of the `/etc/ci_environment` file. This will maintain compatibility with both CI and `hack/get_ci_vm.sh` use. Signed-off-by: Chris Evich <cevich@redhat.com>
* Merge pull request #14178 from edsantiago/bloat_fixOpenShift Merge Robot2022-05-10
|\ | | | | bloat check: make more robust
| * bloat check: make more robustEd Santiago2022-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of 'C^' (parent) in 'git rebase' is counterintuitive, at least to me: when C is a merge of multiple commits, rebase picks each of those commits. That probably makes good sense to a git expert, which I'm not. Solution: forget using '^', just calculate the baseline sizes by doing a checkout of the PR's parent. Also: compute PR parent using git-merge-base instead of blindly trusting $DEST_BRANCH (which may be volatile as other PRs are merged). Also: run git-rebase directly, not via make rule. That indirection is too confusing here. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #14167 from giuseppe/play-kube-honor-pod-security-contextOpenShift Merge Robot2022-05-10
|\ \ | |/ |/| kube: honor pod security context IDs
| * kube: honor pod security context IDsGiuseppe Scrivano2022-05-10
| | | | | | | | | | | | | | | | If the RunAsUser, RunAsGroup, SupplementalGroups settings are not overriden in the container security context, then take the value from the pod security context. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * kube: refactor setupSecurityContext to accept directly the security ctxGiuseppe Scrivano2022-05-10
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #14147 from ttys3/Container.cGroupPath-Error-parsing-cgroupOpenShift Merge Robot2022-05-10
|\ \ | |/ |/| fix: Container.cGroupPath() skip empty line to avoid false error logging
| * fix: Container.cGroupPath() skip empty line to avoid false error loggingttyS32022-05-10
|/ | | | | | Signed-off-by: ttyS3 <ttys3.rust@gmail.com> [NO NEW TESTS NEEDED]
* Merge pull request #14158 from edsantiago/test_skip_fix_mainOpenShift Merge Robot2022-05-09
|\ | | | | test skipper: check for $DEST_BRANCH
| * test skipper: check for $DEST_BRANCHEd Santiago2022-05-09
|/ | | | | | | | | | | | | | The test-skipping optimization is failing as rootless on non-main, because $DEST_BRANCH is not set. Solution: check for envariable, skip test if missing. (This was part of my original PR, but was accidentally removed in #14013) Also: DEST_BRANCH was silently being defaulted to 'main' in lib.sh. Remove that: per @cevich, it is no longer necessary. Fixes: #14131 Signed-off-by: Ed Santiago <santiago@redhat.com>
* Merge pull request #14163 from Luap99/fix-14162OpenShift Merge Robot2022-05-09
|\ | | | | fix broken CI test
| * fix broken CI testPaul Holzinger2022-05-09
|/ | | | | | | | | | Commit b58e7e7f11 was not fully rebased before merging and is now breaking CI because commit 69c479b16e19 made the underlying error visible. Using journald inside the container tests is not supported. Fixes #14162 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* Merge pull request #14152 from giuseppe/fix-ci-search-jsonOpenShift Merge Robot2022-05-09
|\ | | | | test: fix "podman search format json"
| * test: fix "podman search format json"Giuseppe Scrivano2022-05-08
| | | | | | | | | | | | | | | | | | | | the alpine image used previously returns a description that contains '...': $ podman search --format json alpine | fgrep ...\"\, "Description": "alpine 3.7 with bash, perl, gzip, wget...", Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #14121 from cdoern/kubeOpenShift Merge Robot2022-05-09
|\ \ | | | | | | play kube log tag handling
| * | play kube log tag handlingcdoern2022-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | currently tags cause a panic due to an uninitialized map. Initialize the map and add parsing to make sure we are only tagging with journald resolves #13356 Signed-off-by: cdoern <cbdoer23@g.holycross.edu>
* | | Merge pull request #14136 from Luap99/config-networksOpenShift Merge Robot2022-05-06
|\ \ \ | |_|/ |/| | libpod: add c.ConfigWithNetworks()
| * | libpod: add c.ConfigWithNetworks()Paul Holzinger2022-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reading the networks requires an extra db operation. Most c.Config() callers do not need them so create a new function which returns the config with networks. [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #14139 from mheon/bump_main_410OpenShift Merge Robot2022-05-06
|\ \ \ | | | | | | | | Update main branch to reflect 4.1.0 release
| * | | Update version to v4.2.0-devMatthew Heon2022-05-06
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | Update release notes for Podman v4.1.0Matthew Heon2022-05-06
| |/ / | | | | | | | | | | | | | | | Also bumps version in README. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #14138 from Luap99/api-4.1OpenShift Merge Robot2022-05-06
|\ \ \ | | | | | | | | [CI:DOCS] update podman version in README and API docs
| * | | update podman version in readmePaul Holzinger2022-05-06
| | | | | | | | | | | | | | | | Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | | Add 4.1 branch to API documentationMatthew Heon2022-05-06
| |/ / | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #14137 from ↵OpenShift Merge Robot2022-05-06
|\ \ \ | |/ / |/| | | | | | | | containers/dependabot/go_modules/github.com/docker/docker-20.10.15incompatible Bump github.com/docker/docker from 20.10.14+incompatible to 20.10.15+incompatible
| * | Bump github.com/docker/dockerdependabot[bot]2022-05-06
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.14+incompatible to 20.10.15+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md) - [Commits](https://github.com/docker/docker/compare/v20.10.14...v20.10.15) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #14129 from Juneezee/test/t.TempDirOpenShift Merge Robot2022-05-06
|\ \ | | | | | | test: use `T.TempDir` to create temporary test directory
| * | test: fix failing TestPostDeleteHooksEng Zer Jun2022-05-05
| | | | | | | | | | | | | | | | | | | | | We no longer create the temporary directory as `libpod_test_*`. The directory returned by `t.TempDir()` is TestPostDeleteHooks/001 Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
| * | test: use `T.TempDir` to create temporary test directoryEng Zer Jun2022-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit replaces `ioutil.TempDir` with `t.TempDir` in tests. The directory created by `t.TempDir` is automatically removed when the test and all its subtests complete. Prior to this commit, temporary directory created using `ioutil.TempDir` needs to be removed manually by calling `os.RemoveAll`, which is omitted in some tests. The error handling boilerplate e.g. defer func() { if err := os.RemoveAll(dir); err != nil { t.Fatal(err) } } is also tedious, but `t.TempDir` handles this for us nicely. Reference: https://pkg.go.dev/testing#T.TempDir Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
* | | Merge pull request #14125 from flouthoc/podman-remote-doc-build-outputOpenShift Merge Robot2022-05-05
|\ \ \ | | | | | | | | build: disable and hide `--output` for podman-remote clients
| * | | build: disable --output for podman-remote clientsAditya R2022-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable `build --output` for remote clients and update docs. [NO NEW TESTS NEEDED] [NO TESTS NEEDED] Signed-off-by: Aditya R <arajan@redhat.com>
* | | | Merge pull request #14124 from vrothberg/e2e-cleanupsOpenShift Merge Robot2022-05-05
|\ \ \ \ | |/ / / |/| | | e2e cleanups
| * | | e2e: pull_test: speed up --all-tagsValentin Rothberg2022-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulling the K8s pause image seems unnecessarily expensive to me. Let's use the testgitest_v2s2 one which is under our control and weighs only a couple of KB. This cut the execution time in less than half on my machine. Since it's network bound and I am running on fibre, I expect more significant speed ups in slower networks. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
| * | | e2e: pull_test: squash --quiet testValentin Rothberg2022-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squash the --quiet test into another one. The test was more complex than necessary and can easily be squashed into another one to avoid one more expensive pull. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
| * | | e2e: pull_test: move tests aroundValentin Rothberg2022-05-05
| | | | | | | | | | | | | | | | | | | | | | | | Let's keep simple tests at the top and complex ones at the bottom. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
| * | | e2e: pull_test: remove redundant testsValentin Rothberg2022-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once upon a time, the tests actually pulled from Docker Hub. This has changed with the rate limits, so we can safely remove the redundant tests to speed up CI. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
| * | | e2e: manifest_test: use cached registryValentin Rothberg2022-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Used the cached registry archive instead of pulling down the image from Quay. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* | | | Merge pull request #14118 from rhatdan/VENDOROpenShift Merge Robot2022-05-05
|\ \ \ \ | | | | | | | | | | Vendor in containers/buildah@v1.26.1
| * | | | Vendor in containers/buildah@v1.26.1Daniel J Walsh2022-05-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #14098 from Luap99/test-toolsOpenShift Merge Robot2022-05-05
|\ \ \ \ \ | | | | | | | | | | | | vendor test dependencies instead of installing via network
| * | | | | exclude new tools vendor dir from validatePaul Holzinger2022-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have no control over the code in the vendored files. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | | | | add dependabot config for test/tools go.modPaul Holzinger2022-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependabot should update out test dependencies as well. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | | | | vendor test tools in submodulePaul Holzinger2022-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using the main module we should vendor the test tools in a different directory. That way we do not add extra dependencies to the main module which can be problemetic for packages or other users. This is already done in buildah so this makes us more consitent. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | | | | vendor test dependencies instead of installing via networkPaul Holzinger2022-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can vendor the test dependencies such as go-md2man, git-validation and goimports. This allows us to always install the same version as specified in go.mod. Also we do not rely on a network connection for this. The advantage with this method is that dependabot will also update the dependencies for us and we do not have to hardcode versions in the Makefile. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | | | Merge pull request #14059 from cdoern/cloneOpenShift Merge Robot2022-05-05
|\ \ \ \ \ \ | | | | | | | | | | | | | | pass networks to container clone
| * | | | | | pass networks to container clonecdoern2022-05-03
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since the network config is a string map, json.unmarshal does not recognize the config and spec as the same entity, need to map this option manually resolves #13713 Signed-off-by: cdoern <cbdoer23@g.holycross.edu>
* | | | | | Merge pull request #14123 from DE0CH/rootless_tutorialOpenShift Merge Robot2022-05-05
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | [CI:DOCS] Update rootless_tutorial.md
| * | | | | update rootless_tutorial.mdDeyao Chen2022-05-05
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The links to the installation instructions and build instructions seem to be outdated, so this PR updates them. Signed-off-by: Deyao Chen <chendeyao000@gmail.com>
* | | | | Merge pull request #14122 from dcermak/patch-1OpenShift Merge Robot2022-05-05
|\ \ \ \ \ | | | | | | | | | | | | Fix usermod call in rootless_tutorial.md
| * | | | | Fix usermod call in rootless_tutorial.mdDan Čermák2022-05-05
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `usermod` calls in rootless_tutorial.md were only adding a very narrow range for subuids and subgids, which will cause failures with containers where a file is owned by a user or group with a uid/gid > 1001. Signed-off-by: Dan Čermák <dcermak@suse.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-26 20:23:04 +0000