summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add "podman kube play" cmdNiall Crowe2022-07-13
| | | | | | | | | | | The "podman kube play" command is designed to be a replacement for the "podman play kube" command. It performs the same function as "play kube" while also still working with the same flags and options. The "podman play kube" command is still functional as an alias of "kube play". Closes #12475 Signed-off-by: Niall Crowe <nicrowe@redhat.com> Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* Merge pull request #14904 from giuseppe/move-to-subcgroup-in-a-containeropenshift-ci[bot]2022-07-13
|\ | | | | abi: create new cgroup when running in a container
| * abi: create new cgroup when running in a containerGiuseppe Scrivano2022-07-13
| | | | | | | | | | | | | | | | | | | | | | if podman is running in the root cgroup, it will create a new subcgroup and move itself there. [NO NEW TESTS NEEDED] it needs nested podman Closes: https://github.com/containers/podman/issues/14884 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * podman: always call into SetupRootlessGiuseppe Scrivano2022-07-13
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * utils: call MaybeMoveToSubCgroup onceGiuseppe Scrivano2022-07-13
| | | | | | | | | | | | memoize its result and use it for subsequent calls. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * podman: move MaybeMoveToSubCgroup to utils/Giuseppe Scrivano2022-07-13
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #14916 from rhatdan/dockeropenshift-ci[bot]2022-07-13
|\ \ | |/ |/| Docker uses "-c" to mean "--cpu-shares" in create and run
| * Docker uses "-c" to mean "--cpu-shares" in create and runDaniel J Walsh2022-07-12
| | | | | | | | | | | | | | Add support for -c as an alias for --cpu-shares to be compatible with Docker. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #14910 from flouthoc/fix-testopenshift-ci[bot]2022-07-12
|\ \ | | | | | | test,manifest-run: declare `TARGETPLATFORM` in test containerfile.
| * | test,manifest-run: declare TARGETPLATFORM before using itAditya R2022-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of fix for https://github.com/openshift/imagebuilder/issues/231 `FROM` does not expands `ARGS` which are not declared so `TARGETPLATFORM` Note: I think a patch should be added at imagebuilder to allow using inbuilt ARGS in FROM without declaring it as well but it is something to be discussed so lets declare it manually in our tests [NO NEW TESTS NEEDED] [NO TESTS NEEDED] Signed-off-by: Aditya R <arajan@redhat.com>
* | | Merge pull request #14905 from eriksjolund/remove_rootless_considerationsopenshift-ci[bot]2022-07-12
|\ \ \ | | | | | | | | [CI:DOCS] rootless_tutorial: Remove incorrect advice regarding volume…
| * | | [CI:DOCS] rootless_tutorial: Remove incorrect advice regarding volumes and ↵Erik Sjölund2022-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mount points * Remove the instruction "The mount point must exist in the container" as it is incorrect which is shown by this example ``` $ mkdir dir1 $ podman run --rm -v ./dir1:/dir1:Z docker.io/library/fedora:36 touch /dir1/file $ ls dir1 file $ podman run --rm docker.io/library/fedora:36 ls -l /dir1 ls: cannot access '/dir1': No such file or directory $ podman --version podman version 4.1.1 $ ``` * Rewrite the advice "You should always give the full path to the volume you'd like to mount" so that it also mentions relative paths starting with a dot. Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* | | | Merge pull request #14912 from edsantiago/ci_confirm_runtimeopenshift-ci[bot]2022-07-12
|\ \ \ \ | |_|_|/ |/| | | [CI:DOCS] CI: sanity check for desired runtime
| * | | CI: sanity check for desired runtimeEd Santiago2022-07-12
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're still not testing runc in CI (#14833), and it may be weeks or months before we can, due to criu/glibc nightmare, but one day we'll be back on track, then later on we'll update VMs again, and screw it up, and lose runc, and not notice, and RHEL will break, and oh noes headless chicken again, repeat repeat. We can do better. Use .cirrus.yml to explicitly define which VMs should use which runtimes, and enforce it early in the CI build step. This should never fail (uh huh) in a PR, only in one of the update-VM PRs. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #14911 from ↵Daniel J Walsh2022-07-12
|\ \ \ | | | | | | | | | | | | | | | | eriksjolund/remove_builtin_volume_option_from_man_pages [CI:DOCS] man pages: remove non-existent option builtin-volume
| * | | [CI:DOCS] man pages: remove non-existent option builtin-volumeErik Sjölund2022-07-12
| |/ / | | | | | | | | | | | | | | | Closes #14906 Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* | | Merge pull request #14893 from Luap99/machine-proxyopenshift-ci[bot]2022-07-12
|\ \ \ | |/ / |/| | podman machine: do not commit proxies into config file
| * | podman machine: do not commit proxies into config filePaul Holzinger2022-07-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qemu fails when the same `fw_cfg` options is used more than once. Since the current logic always adds a new option on each machine load this will fail on the second start. We can fix this by checking if the option is already set and replace but I think it is easier to just not commit the option in the config and add it dynamically on start. User that hit this bug have to recreate the machine. [NO NEW TESTS NEEDED] Fixes #14636 Fixes #14837 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #14896 from edsantiago/logformatter_by_taskopenshift-ci[bot]2022-07-12
|\ \ \ | |_|/ |/| | logformatter: link by *task ID*, not build ID
| * | logformatter: link by *task ID*, not build IDEd Santiago2022-07-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: task IDs are unique and permanent; linking by build ID and task name is non-unique, because Re-run. Fixes: #14863 Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #14901 from tyler92/fix-trace-logopenshift-ci[bot]2022-07-12
|\ \ \ | | | | | | | | fix wrong log message on Trace level
| * | | fix wrong log message on Trace levelMikhail Khachayants2022-07-12
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Empty path to runtime binary was printed instead of a real path. Before fix: TRAC[0000] found runtime "" TRAC[0000] found runtime "" After: TRAC[0000] found runtime "/usr/bin/crun" TRAC[0000] found runtime "/usr/bin/runc" Signed-off-by: Mikhail Khachayants <khachayants@arrival.com>
* | | Merge pull request #14898 from ↵openshift-ci[bot]2022-07-11
|\ \ \ | |/ / |/| | | | | | | | eriksjolund/improve_language_and_fix_spelling_and_typos [CI:DOCS] Improve language. Fix spelling and typos.
| * | [CI:DOCS] Improve language. Fix spelling and typos.Erik Sjölund2022-07-11
|/ / | | | | | | | | | | | | | | | | * Correct spelling and typos. * Improve language. Co-authored-by: Ed Santiago <santiago@redhat.com> Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* | Merge pull request #14181 from umohnani8/kube-hostnameopenshift-ci[bot]2022-07-11
|\ \ | |/ |/| Add ports and hostname correctly in kube yaml
| * Add ports and hostname correctly in kube yamlUrvashi Mohnani2022-07-08
| | | | | | | | | | | | | | | | | | | | | | | | If a pod is created without net sharing, allow adding separate ports for each container to the kube yaml and also set the pod level hostname correctly if the uts namespace is not being shared. Add a warning if the default namespace sharing options have been modified by the user. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | Merge pull request #14874 from vrothberg/fix-14859openshift-ci[bot]2022-07-11
|\ \ | | | | | | exit code improvements
| * | libpod: read exit code when cleaning up the runtimeValentin Rothberg2022-07-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While for some call paths we may be doing this redundantly we need to make sure the exit code is always read at this point. [NO NEW TESTS NEEDED] as I do not manage to reproduce the issue which is very likely caused by a code path not writing the exit code when running concurrently. Fixes: #14859 Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
| * | podman wait: return 0 if container never ranValentin Rothberg2022-07-11
| | | | | | | | | | | | | | | | | | | | | Make sure to return/exit with 0 when waiting for a container that never ran. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
| * | test/system/130-kill.bats: use $IMAGEValentin Rothberg2022-07-11
| | | | | | | | | | | | | | | | | | A copy-paste error led to use `alpine` instead. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* | | Merge pull request #14889 from eriksjolund/rewrite_gidmap_option_docsopenshift-ci[bot]2022-07-11
|\ \ \ | | | | | | | | [CI:DOCS] Rewrite the --gidmap option docs
| * | | [CI:DOCS] Rewrite the --gidmap option docsErik Sjölund2022-07-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reference --uidmap in --gidmap docs for additional information * Remove --gidmap example "groupname -> 100000 / 30000 -> 0" Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* | | | Merge pull request #14826 from sstosh/net-pruneopenshift-ci[bot]2022-07-11
|\ \ \ \ | |/ / / |/| | | Refactored networkPrune function
| * | | Refactored networkPrune functionToshiki Sonoda2022-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored the networkPrune function to improve readability. This commit changes the `networkPrune` function to use the `PrintNetworkPruneResults` function. [NO NEW TESTS NEEDED] Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
* | | | Merge pull request #14887 from eriksjolund/podman_info_command_completion_docopenshift-ci[bot]2022-07-11
|\ \ \ \ | |_|/ / |/| | | [CI:DOCS] podman-info.1.md: update examples (now also shell completion and jq)
| * | | [CI:DOCS] podman-info.1.md: Update examplesErik Sjölund2022-07-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add example "Extracting the list of container registries with a Go template". (The example was already present but in a much shorter form) * Add example "Extracting the list of container registries from JSON with jq". * Add shell completion instructions Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* | | | Merge pull request #14818 from rhatdan/waitopenshift-ci[bot]2022-07-11
|\ \ \ \ | |/ / / |/| | | podman wait can take multiple conditions
| * | | podman wait can take multiple conditionsDaniel J Walsh2022-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman wait should not be defaulting to just stopped. By default wait API waits for stopped and exited. We should not override this on the client side. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #14219 from mheon/bump_versionopenshift-ci[bot]2022-07-08
|\ \ \ \ | | | | | | | | | | Bump Compat API maximum version to v1.41
| * | | | Bump Compat API maximum version to v1.41Matthew Heon2022-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker bumped their API, so we should do the same. Fixes #14204 Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | Merge pull request #14870 from vrothberg/fix-14846Daniel J Walsh2022-07-08
|\ \ \ \ \ | | | | | | | | | | | | improve pull-policy documentation
| * | | | | improve pull-policy documentationValentin Rothberg2022-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the docs for pull policies is consistent with Buildah and reflects the implementation. Further improve the help messages and auto completions. [NO NEW TESTS NEEDED] Fixes: #14846 Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* | | | | | Merge pull request #14853 from baude/machinetestsfixopenshift-ci[bot]2022-07-08
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix machine tests
| * | | | | | Fix machine testsBrent Baude2022-07-08
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch up with regressions that have occurred since the tests were originally written. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | | | Merge pull request #14872 from edsantiago/deferred_deferopenshift-ci[bot]2022-07-08
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Manifest test cleanup: use defer()
| * | | | | Manifest test cleanup: use defer()Ed Santiago2022-07-08
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup to #14845: use defer(), not fragile global context, to stop registry and clean up temporary envariable. Thanks to mitr for the suggestion. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #14839 from saschagrunert/errors-pkgopenshift-ci[bot]2022-07-08
|\ \ \ \ \ | |_|/ / / |/| | | | pkg: switch to golang native error wrapping
| * | | | pkg: switch to golang native error wrappingSascha Grunert2022-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use the golang error wrapping format specifier `%w` instead of the deprecated github.com/pkg/errors package. [NO NEW TESTS NEEDED] Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
* | | | | Merge pull request #14845 from edsantiago/registry_sanitizeopenshift-ci[bot]2022-07-08
|\ \ \ \ \ | | | | | | | | | | | | manifest_test: safer registry setup and teardown
| * | | | | manifest_test: safer registry setup and teardownEd Santiago2022-07-07
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manifest_test:authenticated_push() is the final test left to fix before merging #14397. The reason it's failing _seems_ to be that podman is running with a mix of netavark and CNI, and that _seems_ to be because this test invokes hack/podman-registry which invokes plain podman without whatever options used in e2e. Starting a registry directly from the test is insane: there is no reusable code for doing that (see login_logout_test.go and push_test.go. Yeesh.) Solution: set $PODMAN, by inspecting the podmanTest object which includes both a path and a list of options. podman-registry will invoke that. (It will also override --root and --runroot. This is the desired behavior). Also: add cleanup. If auth-push test fails, stop the registry. Also: add a sanity check to podman-registry script, have it wait for the registry port to activate. Die if it doesn't. That could've saved us a nice bit of debugging time. Signed-off-by: Ed Santiago <santiago@redhat.com>