summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #11704 from rhatdan/kubeOpenShift Merge Robot2021-09-23
|\ | | | | podman generate kube should not include images command
| * podman generate kube should not include images commandDaniel J Walsh2021-09-22
| | | | | | | | | | | | | | | | | | If the command came from the underlying image, then we should not include it in the generate yaml file. Fixes: https://github.com/containers/podman/issues/11672 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #11691 from afbjorklund/machine-listOpenShift Merge Robot2021-09-22
|\ \ | | | | | | Add more information about the VM to podman machine list
| * | Also show the (initial) disk sizeAnders F Björklund2021-09-22
| | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
| * | Show cpus and memory in machine listAnders F Björklund2021-09-22
| | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | Merge pull request #11604 from rhatdan/deleteContainerOpenShift Merge Robot2021-09-22
|\ \ \ | | | | | | | | Ignore mount errors except ErrContainerUnknown when cleaningup container
| * | | Ignore mount errors except ErrContainerUnknown when cleaningup containerDaniel J Walsh2021-09-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/11207 [NO TESTS NEEDED] Since I don't know how to get into this situation. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #11701 from ashley-cui/streamOpenShift Merge Robot2021-09-22
|\ \ \ \ | | | | | | | | | | Fix machine image
| * | | | Fix machine imageAshley Cui2021-09-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure setting machine image to `testing` pulls down the testing stream, and not the next stream Signed-off-by: Ashley Cui <acui@redhat.com>
* | | | | Merge pull request #11693 from rhatdan/cleanupOpenShift Merge Robot2021-09-22
|\ \ \ \ \ | |_|/ / / |/| | | | standardize logrus messages to upper case
| * | | | standardize logrus messages to upper caseDaniel J Walsh2021-09-22
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ERROR: Error stutter from logrus messages also. [ NO TESTS NEEDED] This is just code cleanup. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #11689 from Luap99/con-stateOpenShift Merge Robot2021-09-22
|\ \ \ \ | |_|_|/ |/| | | sync container state before reading the healthcheck
| * | | sync container state before reading the healthcheckPaul Holzinger2021-09-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The health check result is stored in the container state. Since the state can change or might not even be set we have to retrive the current state before we try to read the health check result. Fixes #11687 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | Merge pull request #11694 from edsantiago/prevent_port_collisionsOpenShift Merge Robot2021-09-22
|\ \ \ \ | | | | | | | | | | Eighty-six eighty-eighty
| * | | | Eighty-six eighty-eightyEd Santiago2021-09-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Sorry, couldn't resist). CI flakes have been coming down - thank you to everyone who has been making them a priority. This leaves a noisy subset that I've just been ignoring for months: Running: podman ... -p 8080:something ...cannot listen on the TCP port: listen tcp4 :8080: bind: address already in use Sometimes these are one-time errors resolved on 2nd try; sometimes they fail three times, forcing CI user to hit Rerun. In all cases they make noise in my flake logs, which costs me time. My assumption is that this has to do with ginkgo running random tests in parallel. Since many e2e tests simplemindedly use 8080, collisions are inevitable. Solution: simplemindedly replace 8080 with other (also arbitrarily picked) numbers. This is imperfect -- it requires human developers to pick a number NNNN and 'grep NNNN test/e2e/*' before adding new tests, which I am 100% confident ain't gonna happen -- but it's better than what we have now. Side note: I considered writing and using a RandomAvailablePort() helper, but that would still be racy. Plus, it would be a pain to interpolate strings into so many places. Finally, with this hand-tooled approach, if/when we _do_ get conflicts on port NNNN, it should be very easy to grep for NNNN, find the offending tests that reuse that port, and fix one of them. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #11657 from ↵OpenShift Merge Robot2021-09-22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/k8s.io/api-0.22.2 Bump k8s.io/api from 0.22.1 to 0.22.2
| * | | | | Bump k8s.io/api from 0.22.1 to 0.22.2dependabot[bot]2021-09-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.22.1 to 0.22.2. - [Release notes](https://github.com/kubernetes/api/releases) - [Commits](https://github.com/kubernetes/api/compare/v0.22.1...v0.22.2) --- updated-dependencies: - dependency-name: k8s.io/api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | | | Merge pull request #11629 from Luap99/CNI-1.0OpenShift Merge Robot2021-09-22
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Bump CNI to v1.0.1
| * | | | | Bump CNI to v1.0.1Paul Holzinger2021-09-22
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CNI so we can match wrapped errors. This should silence ENOENT warnings when trying to read the cni conflist files. Fixes #10926 Because CNI v1.0.0 contains breaking changes we have to change some import paths. Also we cannot update the CNI version used for the conflist files created by `podman network create` because this would require at least containernetwork-plugins v1.0.1 and a updated dnsname plugin. Because this will take a while until it lands in most distros we should not use this version. So keep using v0.4.0 for now. The update from checkpoint-restore/checkpointctl is also required to make sure it no longer uses CNI to read the network status. [NO TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | | Merge pull request #11692 from Luap99/nettypesOpenShift Merge Robot2021-09-22
|\ \ \ \ \ | | | | | | | | | | | | net types: remove omitempty from required fields
| * | | | | net types: remove omitempty from required fieldsPaul Holzinger2021-09-22
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make reading the fields easier in rust because we can guarantee that the fields will be present in the json output. [NO TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | | Merge pull request #11678 from vrothberg/fix-11613OpenShift Merge Robot2021-09-22
|\ \ \ \ \ | |/ / / / |/| | | | podman save: add `--uncompressed`
| * | | | podman save: add `--uncompressed`Valentin Rothberg2021-09-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to `podman save` to allow uncompressed layers when copying OCI images. Do the neccessary plumbing for the remote client, add tests and vendor in the latest commit from c/common to fetch the neccessary changes in libimage. Closes: #11613 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #11659 from vrothberg/psgoOpenShift Merge Robot2021-09-22
|\ \ \ \ \ | |/ / / / |/| | | | vendor c/psgo@v1.7.1
| * | | | vendor c/psgo@v1.7.1Valentin Rothberg2021-09-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | psgo added support for listing supplementary groups via two new descriptors: * `groups` for supplementary groups inside the container * `hgroups` for the counterpart on the host Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #11681 from mheon/retry_event_lookupOpenShift Merge Robot2021-09-22
|\ \ \ \ \ | |_|/ / / |/| | | | Add a backoff and retries to retrieving exited event
| * | | | Add a backoff and retries to retrieving exited eventMatthew Heon2021-09-21
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a potential race around extremely short-running containers and events with journald. Events may not be written for some time (small, but appreciable) after they are received, and as such we can fail to retrieve it if there is a sufficiently short time between us writing the event and trying to read it. Work around this by just retrying, with a 0.25 second delay between retries, up to 4 times. [NO TESTS NEEDED] because I have no idea how to reproduce this race in CI. Fixes #11633 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #11641 from TomSweeneyRedHat/dev/tsweeney/myaliasOpenShift Merge Robot2021-09-21
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Add network alias note in man pages
| * | | | [CI:DOCS] Add network alias note in man pagesTomSweeneyRedHat2021-09-21
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Adds a note about the limitation of network aliases to the man pages This should satisfy https://issues.redhat.com/browse/RUN-1189 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | Merge pull request #11579 from cevich/add_cross_releaseOpenShift Merge Robot2021-09-21
|\ \ \ \ | |/ / / |/| | | Cross-build linux releases w/ arch in filename
| * | | Cross-build release-archives w/ arch in filenameChris Evich2021-09-21
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11417 Cross-building the podman-remote documentation requires a functional native architecture executable. However `make` only deals with files/timestamps, it doesn't understand if an existing binary will function on the system or not. This makes building cross-platform releases incredibly accident-prone and fragile. A practical way to deal with this, is via multiple conditional (nested) `make` calls along with careful manipulation of `$GOOS` and `$GOARCH`. Also, when cross-building releases be kind to humans and cleanup any non-native binaries left behind. Update the `Alt Arch. Cross` Cirrus-CI task to build release archives for all Linux architectures supported by golang and podman. Update the `OSX Cross` task to additionally build for the M1 (arm64) architecture. Finally, update the release process documentation to reflect the new locations (Cirrus-CI task names) for the release archives. Include a note about additional manual work being required to produce the signed `.dmg` file for MacOS. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #11631 from cevich/replace_hack-get_release_infoOpenShift Merge Robot2021-09-21
|\ \ \ | | | | | | | | Fix Error, empty output for info: 'VERSION'
| * | | Fix Error, empty output for info: 'VERSION'Chris Evich2021-09-21
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building releases, the definitive canonical version of podman (or podman-remote) is needed. Previously this was accomplished by scraping `version/version.go`. However, due to tooling differences across platforms, this has proven problematic, unreliable, and hard to maintain. Fix this by building and caching a small golang binary who's only purpose is to print the version number to stdout. This not only provides a quick and reliable way to determine the current version, it also acts as a check on the version API vs tooling that relies on it. Lastly, remove several `RELEASE_*` Makefile definitions which aren't actually used anywhere. These were originally added a very long time ago to serve as part of a long since retired release process. The remaining items, were updated to make use of the new `.podmanversion` binary on an as-required basis (i.e. not every time `make` is run). Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #11662 from baude/kubenodevOpenShift Merge Robot2021-09-21
|\ \ \ | | | | | | | | Remove references to kube being development
| * | | Remove references to kube being developmentBrent Baude2021-09-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At this point and even though we are always improving the play and generate kube functions, I would say it no longers needs to be denoted as under development. [NO TESTS NEEDED] Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | Merge pull request #11676 from rhatdan/kubeOpenShift Merge Robot2021-09-21
|\ \ \ \ | | | | | | | | | | Generate kube shouldn't add podman default environment vars
| * | | | Generate kube should'd add podman default environment varsDaniel J Walsh2021-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we add the default PATH, TERM and container from Podman to every kubernetes.yaml file. These values should not be recorded in the yaml files. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #11650 from flouthoc/named-volume-overlayOpenShift Merge Robot2021-09-21
|\ \ \ \ \ | |/ / / / |/| | | | volume: Add support for overlay on named volumes
| * | | | volume: Add support for overlay on named volumesAditya Rajan2021-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following PR allows containers to create and mount overlays on top of named volumes instead of mounting actual volumes via already documented `:O`. Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | | | | Merge pull request #11518 from cdoern/podDeviceOpenShift Merge Robot2021-09-21
|\ \ \ \ \ | |/ / / / |/| | | | Pod Devices support
| * | | | Pod Device Supportcdoern2021-09-20
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added support for pod devices. The device gets added to the infra container and recreated in all containers that join the pod. This required a new container config item to keep track of the original device passed in by the user before the path was parsed into the container device. Signed-off-by: cdoern <cdoern@redhat.com>
* | | | Merge pull request #11639 from jwhonce/issues/2221OpenShift Merge Robot2021-09-20
|\ \ \ \ | | | | | | | | | | Support --format tables in ps output
| * | | | Support --format tables in ps outputJhon Honce2021-09-20
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added tests to help ensure there is no future regressions - Added WaitWithTimeout(int) rather than calling WaitWithDefaultTimeout() multiple times - Exposed DefaultWaitTimeout to allow test to use a multiplier Fixes #2221 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #11660 from rhatdan/docsOpenShift Merge Robot2021-09-20
|\ \ \ \ | | | | | | | | | | Add podman image/container inspect man pages
| * | | | Add podman image/container inspect man pagesDaniel J Walsh2021-09-20
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] since this is really a docs change. Concludes: https://github.com/containers/podman/pull/11620 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #11630 from rhatdan/timeoutOpenShift Merge Robot2021-09-20
|\ \ \ \ | | | | | | | | | | Add support for retrieving system service --timeout
| * | | | Add support for retrieving system service --timeoutDaniel J Walsh2021-09-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #11601 from cdoern/mapOptionsOpenShift Merge Robot2021-09-20
|\ \ \ \ \ | | | | | | | | | | | | Created MapOptions for PodCreate
| * | | | | Created MapOptions for PodCreatecdoern2021-09-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MapOptions take the pod and container create options, assigning matching values from infra back to the pod for the Libpod API. This function, unlike the previous one, does not require any manual additions when new options are added since it uses the structs JSON tags, this is a more modular approach. Signed-off-by: cdoern <cdoern@redhat.com>
* | | | | | Merge pull request #11649 from Luap99/machine-dnsOpenShift Merge Robot2021-09-20
|\ \ \ \ \ \ | | | | | | | | | | | | | | podman machine: use gvproxy for host.containers.internal