summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #8405 from jwhonce/wip/versionOpenShift Merge Robot2020-11-19
|\ | | | | Fix sed regex to update version in version/version.go
| * Fix sed regex to update version in version/version.goJhon Honce2020-11-18
| | | | | | | | Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | Merge pull request #8379 from rhatdan/remote2OpenShift Merge Robot2020-11-18
|\ \ | |/ |/| Remove build \!remote flags from test phase 2
| * Remove build \!remote flags from test phase 2Daniel J Walsh2020-11-18
| | | | | | | | | | | | | | | | Add some more tests, document cases where remote will not work Add FIXMEs for tests that should work on podman-remote but currently do not. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * podman-remote network rm --force is brokenDaniel J Walsh2020-11-18
| | | | | | | | | | | | | | The --force parameter was not being handled correctly. This is leading to some race conditions in testing failures. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #8395 from Luap99/podman-pod-ps-filtersOpenShift Merge Robot2020-11-18
|\ \ | | | | | | Align the podman pod ps --filter behavior with podman ps
| * | Align the podman pod ps --filter behavior with podman psPaul Holzinger2020-11-18
| |/ | | | | | | | | | | | | | | | | Filters with the same key work inclusive with the only exception being `label` which is exclusive. Filters with different keys always work exclusive. Also update the documentation with the new behavior. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #8170 from rhatdan/remoteOpenShift Merge Robot2020-11-18
|\ \ | | | | | | Remove build \!remote flags from test
| * | Remove build \!remote flags from testDaniel J Walsh2020-11-18
| | | | | | | | | | | | | | | | | | | | | | | | Add some more tests, document cases where remote will not work Add FIXMEs for tests that should work on podman-remote but currently do not. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #8394 from mheon/bump-2.2.0-rc1OpenShift Merge Robot2020-11-18
|\ \ \ | |_|/ |/| | [CI:DOCS] Bump to v2.2.0-RC1
| * | Bump to v2.2.0-devMatthew Heon2020-11-18
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | Bump to v2.2.0-rc1v2.2.0-rc1Matthew Heon2020-11-18
|/ / | | | | | | | | | | Also bump API version to v2.1.0. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #8383 from mheon/release_notes_220_rc1OpenShift Merge Robot2020-11-18
|\ \ | | | | | | [CI:DOCS] Add release notes for v2.2.0-RC1
| * | Add release notes for v2.2.0-RC1Matthew Heon2020-11-18
| | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #8376 from Luap99/podman-filtersOpenShift Merge Robot2020-11-18
|\ \ \ | | | | | | | | Align the podman ps --filter behavior with docker
| * | | Align the podman ps --filter behavior with dockerPaul Holzinger2020-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of our filters worked exclusive resulting in `--filter status=created --filter status=exited` to return nothing. In docker filters with the same key work inclusive with the only exception being `label` which is exclusive. Filters with different keys always work exclusive. This PR aims to match the docker behavior with podman. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #8389 from rhatdan/docsOpenShift Merge Robot2020-11-18
|\ \ \ \ | |_|_|/ |/| | | [CI:DOCS] correct numbering typo
| * | | correct numbering typoSeth Jones2020-11-18
|/ / / | | | | | | | | | | | | | | | Based on PR from @sethjones. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #8337 from cevich/weekly_nix_cache_invalidateOpenShift Merge Robot2020-11-18
|\ \ \ | | | | | | | | Cirrus: Invalidate static cache on VM image update
| * | | Cirrus: Invalidate static cache on VM image updateChris Evich2020-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's important to periodically update the nix cache (about 1GB in size). If not, it can grow stale and has been observed causing task failures. Associating the nix cache update with a VM/Container image update, ensures it happens first in PRs where environment-related failures are less surprising. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #8386 from zhangguanzhang/pod-inspect-macOpenShift Merge Robot2020-11-18
|\ \ \ \ | | | | | | | | | | Fix podman pod inspect show wrong StaticMAC
| * | | | Fix podman pod inspect show wrong MAC stringzhangguanzhang2020-11-18
|/ / / / | | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | | Merge pull request #8382 from dbaker-rh/helppageOpenShift Merge Robot2020-11-18
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Fix example for manifest push
| * | | | Fix example for manifest pushDave Baker2020-11-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Baker <dbaker@redhat.com>
* | | | | Merge pull request #8378 from jwhonce/issues/8366OpenShift Merge Robot2020-11-18
|\ \ \ \ \ | | | | | | | | | | | | Swap out json-iterator for golang default
| * | | | | Swap out json-iterator for golang defaultJhon Honce2020-11-17
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | json-iterator library failed to pretty print json for all inspection types. Fixes #8366 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #8355 from baude/compatnetworkconnectdisconnectOpenShift Merge Robot2020-11-17
|\ \ \ \ \ | | | | | | | | | | | | add network connect|disconnect compat endpoints
| * | | | | add network connect|disconnect compat endpointsbaude2020-11-17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this enables the ability to connect and disconnect a container from a given network. it is only for the compatibility layer. some code had to be refactored to avoid circular imports. additionally, tests are being deferred temporarily due to some incompatibility/bug in either docker-py or our stack. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #8381 from Luap99/rename-test-filesOpenShift Merge Robot2020-11-17
|\ \ \ \ \ | | | | | | | | | | | | Rename e2e test files to include _test.go suffix
| * | | | | Rename e2e test files to include _test.go suffixPaul Holzinger2020-11-17
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The test were working fine. Just my IDE doesn't like the files without the suffix and I don't like red errors. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #8363 from AlbanBedel/play-kube-create-onlyOpenShift Merge Robot2020-11-17
|\ \ \ \ \ | | | | | | | | | | | | Add an option to control if play kube should start the pod
| * | | | | Add an option to control if play kube should start the podAlban Bedel2020-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having play kube start the pod is not always appropriate, one might for example like to have the pod running as a set of systemd services. Add a `start` option to the command line and API to control if the pod should be started or not; it defaults to true for backward compatibility. Signed-off-by: Alban Bedel <albeu@free.fr>
* | | | | | Merge pull request #8380 from AlbanBedel/fix-client-play-kube-tls-verifyOpenShift Merge Robot2020-11-17
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Client call to /play/kube incorrectly set tlsVerify
| * | | | | Client call to /play/kube incorrectly set tlsVerifyAlban Bedel2020-11-17
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The API parameter `tlsVerify` should be the invert of the internal option `SkipTLSVerify`, fix this conversion. Signed-off-by: Alban Bedel <albeu@free.fr>
* | | | | Merge pull request #8377 from jwhonce/wip/formatsOpenShift Merge Robot2020-11-17
|\ \ \ \ \ | | | | | | | | | | | | Fix missing headers in `network ls`
| * | | | | Fix missing headers in `network ls`Jhon Honce2020-11-17
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #8371 from vrothberg/rm-gateOpenShift Merge Robot2020-11-17
|\ \ \ \ \ | | | | | | | | | | | | remove contrib/gate
| * | | | | remove contrib/gateValentin Rothberg2020-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove references on contrib/gate. The gating image is currently not maintained and was replaced in the CI rewrite. We can disable builds in Quay once the change is merged. Note that running `make validate` in a container is still desired. A similar approach may be re-added in the future. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | Merge pull request #8356 from rhatdan/docsOpenShift Merge Robot2020-11-17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [CI:DOCS] Cleanup tutorials
| * | | | | Cleanup tutorialsDaniel J Walsh2020-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by @kannkyo PR. Eliminate sudo when commands will work fine in rootless mode. Make all commands in tutorials easily cut and pastable, by eliminating $ and > symbols. This should make them all consistant agross different tutorials. Also make all systemctl enable calls use the --now option. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #8373 from TomSweeneyRedHat/dev/tsweeney/nitpickOpenShift Merge Robot2020-11-17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [CI:DOCS] fix an apostrophe nit in man page
| * | | | | [CI:DOCS] fix an apostrophe nit in man pageTomSweeneyRedHat2020-11-17
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | A quick follow up to #8367 to add a missing apostrophe in three man pages. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | Merge pull request #8370 from rhatdan/wrapOpenShift Merge Robot2020-11-17
|\ \ \ \ \ | |/ / / / |/| | | | Remove some more excessive wrapping and stuttering
| * | | | Remove some more excessive wrapping and stutteringDaniel J Walsh2020-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop over wrapping API Calls The API calls will return an appropriate error, and this wrapping just makes the error message look like it is stuttering and a big mess. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #8290 from vrothberg/fix-8265OpenShift Merge Robot2020-11-17
|\ \ \ \ \ | |/ / / / |/| | | | use container cgroups path
| * | | | use container cgroups pathValentin Rothberg2020-11-17
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When looking up a container's cgroup path, parse /proc/[PID]/cgroup. This will work across all cgroup managers and configurations and is supported on cgroups v1 and v2. Fixes: #8265 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #8347 from rhatdan/hostnameOpenShift Merge Robot2020-11-17
|\ \ \ \ | |_|/ / |/| | | Make sure /etc/hosts populated correctly with networks
| * | | Make sure /etc/hosts populated correctly with networksDaniel J Walsh2020-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --hostname and containername should always be added to containers. Added some tests to make sure you can always ping the hostname and container name from within the container. Fixes: https://github.com/containers/podman/issues/8095 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #8346 from Luap99/shell-completionOpenShift Merge Robot2020-11-17
|\ \ \ \ | | | | | | | | | | Improve the shell completion api
| * | | | Improve the shell completion apiPaul Holzinger2020-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One main advantage of the new shell completion logic is that we can easly parse flags and adjust based on the given flags the suggestions. For example some commands accept the `--latest` flag only if no arguments are given. This commit implements this logic in a simple maintainable way since it reuses the already existing `Args` function in the cmd struct. I also refactored the `getXXX` function to match based on the namei/id which could speed up the shell completion with many containers, images, etc... I also added the degraded status to the valid pod status filters which was implemented in #8081. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>