summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #11851 from cdoern/podRmOpenShift Merge Robot2021-10-20
|\ | | | | Pod Rm Infra Handling Improvements
| * Pod Rm Infra Improvementscdoern2021-10-18
| | | | | | | | | | | | | | | | Made changes so that if the pod contains all exited containers and only infra is running, remove the pod. resolves #11713 Signed-off-by: cdoern <cdoern@redhat.com>
* | Merge pull request #12017 from nalind/exponentialOpenShift Merge Robot2021-10-20
|\ \ | | | | | | Use exponential backoff when waiting for a journal entry
| * | Use exponential backoff when waiting for a journal entryNalin Dahyabhai2021-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | When looking for a cursor that matches the first journal entry for a given container, wait and try to find it using exponential backoff. [NO NEW TESTS NEEDED] Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
* | | Merge pull request #12032 from eastonman/eastonman-systemd-patch-1OpenShift Merge Robot2021-10-20
|\ \ \ | | | | | | | | [CI:DOCS] Change systemd service file to be compatible with rootless mode
| * | | systemd: compatible with rootless modeEaston Man2021-10-20
| |/ / | | | | | | | | | | | | | | | | | | - change the type to forking to allow fork. - add default.target for user systemd service Signed-off-by: Easton Man <manyang.me@outlook.com>
* | | Merge pull request #12041 from edsantiago/container_envOpenShift Merge Robot2021-10-20
|\ \ \ | | | | | | | | system tests: CONTAINER_* and --help: cleanup
| * | | system tests: CONTAINER_* and --help: cleanupEd Santiago2021-10-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A small part of this test was written in a confusing and fragile way: it was very hard to understand, and in fact only worked through pure luck (using 'echo $output', which emitted everything in one long line, vs the standard quoted 'echo "$output"' which would've kept the formatting and caused the test to pass, incorrectly, no matter whether --remote was in the output or not). Plus, the '$?' check in the next line would never trigger on failure anyway, so the failure message would've been unhelpful if the test were ever to fail. Anyhow. Make it readable and make it work. (Followup to #11990) Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #12024 from rhatdan/podmanOpenShift Merge Robot2021-10-20
|\ \ \ \ | |/ / / |/| | | podman run --memory=0 ... should not set memory limit
| * | | podman run --memory=0 ... should not set memory limitDaniel J Walsh2021-10-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Docker this is ignored, and it should be on Podman as well. This is documented in the man page. Fixes: https://github.com/containers/podman/issues/12002 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #12030 from rhatdan/manOpenShift Merge Robot2021-10-19
|\ \ \ \ | |/ / / |/| | | [CI:DOCS] Add information on how to discover default log driver
| * | | Add information on how to discover default log driverDaniel J Walsh2021-10-19
|/ / / | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/12008 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #11937 from flouthoc/overlay-rootfs-chownOpenShift Merge Robot2021-10-19
|\ \ \ | | | | | | | | libpod: change mountpoint ownership when creating overlays on top of external rootfs
| * | | libpod: change mountpoint ownership c.Root when using overlay on top of ↵Aditya Rajan2021-10-19
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | external rootfs Allow chainging ownership of mountpoint created on top external overlay rootfs to support use-cases when custom --uidmap and --gidmap are specified. Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | | Merge pull request #12027 from rhatdan/connectOpenShift Merge Robot2021-10-19
|\ \ \ | |/ / |/| | Change podman connection list to use default field
| * | Change podman connection list to use default fieldDaniel J Walsh2021-10-18
|/ / | | | | | | | | | | | | | | | | Stop using "*" to indicate default. Add default field to make it more obvios and the json field more machine usable. Fixes: https://github.com/containers/podman/issues/12019 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #11959 from rhatdan/selinuxOpenShift Merge Robot2021-10-18
|\ \ | | | | | | We should only be relabeling when on first run
| * | We should only be relabeling when on first runDaniel J Walsh2021-10-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | On the second runs, the labels should be the same so no need to relabel. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2013548 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #12016 from edsantiago/socktest_cleanupOpenShift Merge Robot2021-10-18
|\ \ \ | | | | | | | | system tests: socket activation: clean up
| * | | system tests: socket activation: clean upEd Santiago2021-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiarch folks are seeing flakes in this test. I can't reproduce them, but I did notice that the test isn't doing the best possible job of reporting failures nor of confirming what it purports to test. Major fix here is to check the exit status of each curl: if we see the flake again, that will help us track down the failure. Other fixes are just refactoring, cleanup, and disambiguation (using the random service name consistently) Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #12009 from flouthoc/rootfs-overlay-cleanup-leakOpenShift Merge Robot2021-10-18
|\ \ \ \ | |/ / / |/| | | rootfs-overlay: fix overlaybase path for cleanups
| * | | rootfs-overlay: fix overlaybase path for cleanupsAditya Rajan2021-10-18
|/ / / | | | | | | | | | | | | | | | | | | | | | Following commit ensures not dandling mounts are left behind when we are creating an overlay on top of external rootfs. Co-authored-by: Valentin Rothberg <rothberg@redhat.com> Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | | Merge pull request #11990 from rhatdan/remoteOpenShift Merge Robot2021-10-16
|\ \ \ | |/ / |/| | Move CONTAINER_HOST and _CONNECTION to IsRemote Function
| * | Move CONTAINER_HOST and _CONNECTION to IsRemote FunctionDaniel J Walsh2021-10-15
|/ / | | | | | | | | | | | | | | Current code does not check early enough. Follow up to https://github.com/containers/podman/pull/11978 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #11955 from adrianreber/2021-10-13-f35-checkpoint-test-fixOpenShift Merge Robot2021-10-15
|\ \ | | | | | | Checkpoint/Restore test fixes
| * | Checkpoint/Restore test fixesAdrian Reber2021-10-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving to Fedora 35 showed test failures (time outs) in the test "podman checkpoint and restore container with different port mappings" The test starts a container and maps the internal port 6379 to the local port 1234 ('-p 1234:6379') and then tries to connect to localhost:1234 On Fedora 35 this failed and blocked the test because the container was not yet ready. The test was trying to connect to localhost:1234 but nothing was running there. So the error was not checkpointing related. Before trying to connect to the container the test is now waiting for the container to be ready. Another problem with this test and running ginkgo in parallel was that it was possible that the port was already in use. Now for each run a random port is selected to decrease the chance of collisions. Signed-off-by: Adrian Reber <areber@redhat.com>
* | | Merge pull request #11982 from umohnani8/targetPortOpenShift Merge Robot2021-10-15
|\ \ \ | | | | | | | | Set targetPort to the port value in the kube yaml
| * | | Set targetPort to the port value in the kube yamlUrvashi Mohnani2021-10-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the targetPort is not defined, it is supposed to be set to the port value according to the k8s docs. Add tests for targetPort. Update tests to be able to check the Service yaml that is generated. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | | Merge pull request #11978 from rhatdan/remoteOpenShift Merge Robot2021-10-15
|\ \ \ \ | | | | | | | | | | If CONTAINER_HOST env variable is set default podman --remote=true
| * | | | If CONTAINER_HOST env variable is set default podman --remote=trueDaniel J Walsh2021-10-14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users enabling CONTAINER_HOST==PATH is indicating to podman they intend to use remote functionality. Fixes: https://github.com/containers/podman/issues/11196 Update man pages to document all of the environment variables. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #11976 from jwhonce/issues/10737OpenShift Merge Robot2021-10-15
|\ \ \ \ | | | | | | | | | | Use CGO_ENABLED=1 when building natively on darwin
| * | | | Use CGO_ENABLED=1 when building natively on darwinJhon Honce2021-10-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to use CGO for mDNS resolution, but cross builds need CGO disabled See https://github.com/golang/go/issues/12524 for details Note: Homebrew forumla will need to be updated to pick up this change Fixes #10737 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #11979 from cevich/more_criu_fixOpenShift Merge Robot2021-10-15
|\ \ \ \ \ | | | | | | | | | | | | Test-hang fix: Wait for ready + timeout on connect.
| * | | | | Test-hang fix: Wait for ready + timeout on connect.Chris Evich2021-10-14
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was observed during initial F35 testing, this test can cause Ginkgo to "hang" by attempting to connect before the redis is up/listening. Fix this by confirming the ready-state before attempting to connect. Also, force IPv4 and timeout on any connection fault - to allow other tests to run. Thanks to Adrian Reber for help on this and related fixes. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #11977 from rhatdan/logOpenShift Merge Robot2021-10-15
|\ \ \ \ \ | | | | | | | | | | | | Don't include ctr.log if not using file logging
| * | | | | Don't include ctr.log if not using file loggingDaniel J Walsh2021-10-14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checkpoint is blowing up when you use --log-driver=none [NO NEW TESTS NEEDED] No way currently to test checkpoint restore. Fixes: https://github.com/containers/podman/issues/11974 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #11980 from umohnani8/kubeOpenShift Merge Robot2021-10-15
|\ \ \ \ \ | |/ / / / |/| | | | Do not add TCP to protocol in generated kube yaml
| * | | | Do not add TCP to protocol in generated kube yamlUrvashi Mohnani2021-10-14
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the default protocol in k8s is TCP, don't add it to the generate yaml when using protocol. Add UDP to the protocol of the generated yaml when udp is being used. Add tests for this as well. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | | Merge pull request #11967 from rhatdan/docsOpenShift Merge Robot2021-10-14
|\ \ \ \ | | | | | | | | | | Fix codespell errors
| * | | | Fix codespell errorsDaniel J Walsh2021-10-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Along with a couple of nits found by Ed. [NO NEW TESTS NEEDED] Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #11971 from rhatdan/archiveOpenShift Merge Robot2021-10-14
|\ \ \ \ \ | |_|/ / / |/| | | | Don't use docker/pkg/archive, use containers/storage/pkg/archive
| * | | | Don't use docker/pkg/archive, use containers/storage/pkg/archiveDaniel J Walsh2021-10-14
| |/ / / | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #11966 from Luap99/panicOpenShift Merge Robot2021-10-14
|\ \ \ \ | |/ / / |/| | | Fix panic in container create compat api
| * | | Fix panic in container create compat apiPaul Holzinger2021-10-14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The bind and tmpfs options can be nil, we have to check that before we try to use it. Fixes #11961 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #11898 from rhatdan/docsOpenShift Merge Robot2021-10-14
|\ \ \ | | | | | | | | [CI:DOCS] Add information about .containerignore to podman build man page
| * | | Add information about .containerignore to podman build man pageDaniel J Walsh2021-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup some other errors in the podman build man page. Also slip a link between .dockerignore and containerignore.5 man page Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #11947 from umohnani8/kubeOpenShift Merge Robot2021-10-14
|\ \ \ \ | | | | | | | | | | Don't add image entrypoint to the generate kube yaml
| * | | | Don't add image entrypoint to the generate kube yamlUrvashi Mohnani2021-10-13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no entrypoint or command is set in the podman create command, and the image command or entrypoint is being used as the default, then do not add the image command or entrypoint to the generated kube yaml. Kubernetes knows to default to the image command and/or entrypoint settings when not defined in the kube yaml. Add and modify tests for this case. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | | Merge pull request #11944 from cdoern/kubeEmitOpenShift Merge Robot2021-10-13
|\ \ \ \ | | | | | | | | | | Kube Gen run as user/group issues
| * | | | Kube Gen run as user/group issuescdoern2021-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the inclusion of RunAsUser or RunAsGroup unless a container is run with the --user flag. When building from an image the user will be pulled from there anyway resolves #11914 Signed-off-by: cdoern <cdoern@redhat.com>