summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #11372 from cevich/apiv2_updateOpenShift Merge Robot2021-08-31
|\ | | | | Cirrus: Reduce APIv2 task timeout
| * Cirrus: Reduce APIv2 task timeoutChris Evich2021-08-31
| | | | | | | | | | | | | | | | | | | | | | | | At the time of this commit, a significant problem has been identified (introduced in f5ce02b227f4). The effect is, `podman pull` has a chance of hanging, especially when re-pulling an existing image. While a fix is in the works, there's no reason to make developers wait the full (default) 1-hour timeout for the APIv2 task. Reduce it to 2x nominal test runtime, so if the hang/flake is hit, the task can be re-run more quickly. Signed-off-by: Chris Evich <cevich@redhat.com>
* | Merge pull request #11316 from vrothberg/fix-10443OpenShift Merge Robot2021-08-31
|\ \ | |/ |/| pass LISTEN_* environment into container
| * pass LISTEN_* environment into containerValentin Rothberg2021-08-31
|/ | | | | | | | | | | | | | | Make sure that Podman passes the LISTEN_* environment into containers. Similar to runc, LISTEN_PID is set to 1. Also remove conditionally passing the LISTEN_FDS as extra files. The condition was wrong (inverted) and introduced to fix #3572 which related to running under varlink which has been dropped entirely with Podman 3.0. Note that the NOTIFY_SOCKET and LISTEN_* variables are cleared when running `system service`. Fixes: #10443 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #11373 from mtrmac/mpb-replaceOpenShift Merge Robot2021-08-31
|\ | | | | Use UNMERGED vbauerster/mpb PR to fix a pull deadlock
| * Use UNMERGED vbauerster/mpb PR to fix a pull deadlockMiloslav Trmač2021-08-31
| | | | | | | | | | | | | | | | | | | | > go mod edit -replace github.com/vbauerster/mpb/v7=github.com/mtrmac/mpb/v7@abort-deadlock > make vendor See https://github.com/vbauerster/mpb/issues/100 and https://github.com/vbauerster/mpb/pull/101 . Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | Merge pull request #11374 from cevich/no_api2_cidocsOpenShift Merge Robot2021-08-31
|\ \ | | | | | | Cirrus: Skip APIv2 tests for [CI:DOCS]
| * | Cirrus: Skip APIv2 tests for [CI:DOCS]Chris Evich2021-08-31
| |/ | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | Merge pull request #11009 from edsantiago/upgrade_test_3OpenShift Merge Robot2021-08-31
|\ \ | |/ |/| Upgrade test: add new baseline
| * upgrade test: add new baselineEd Santiago2021-08-30
| | | | | | | | | | | | Add a new reference point against which to test upgrades. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #11357 from vrothberg/fix-11171OpenShift Merge Robot2021-08-31
|\ \ | | | | | | auto-update: fix authfile label
| * | auto-update: fix authfile labelValentin Rothberg2021-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the container's authfile label is used when pulling down a new image. [NO TESTS NEEDED] since it would require some larger rewrite of the auto-update system tests that I currently have no time for. I added a reminder to have some breadcrumbs when there is more time. Fixes: #11171 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #11353 from flouthoc/resolve-workdir-after-mountsOpenShift Merge Robot2021-08-30
|\ \ \ | |_|/ |/| | container: resolve workdir during initialization after all the mounts are completed.
| * | container: resolve workdir after all the mounts happen.flouthoc2021-08-30
| |/ | | | | | | | | | | | | | | There are use-cases where users would want to use overlay-mounts as workdir. For such cases workdir should be resolved after all the mounts are completed during the container init process. Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | Merge pull request #11342 from baude/machinecleanupsMatthew Heon2021-08-30
|\ \ | | | | | | clean up socket and pid files from podman machine
| * | clean up socket and pid files from podman machineBrent Baude2021-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to avoid segvs, we should clean up as much of the socket and regular files from podman machine as possible on stop. also, on start, we should add logic to remove these files before starting in case the start process is stopped prematurely (due to an error for example). [NO TESTS NEEDED] Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #11360 from Luap99/rootless-resolvOpenShift Merge Robot2021-08-30
|\ \ \ | |_|/ |/| | rootless cni: resolve absolute symlinks correctly
| * | rootless cni: resolve absolute symlinks correctlyPaul Holzinger2021-08-30
|/ / | | | | | | | | | | | | | | | | | | | | When /etc/resolv.conf is a symlink to an absolute path use it and not join it the the previous path. [NO TESTS NEEDED] This depends on the host layout. Fixes #11358 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | Merge pull request #11334 from jwhonce/issues/10831OpenShift Merge Robot2021-08-27
|\ \ | | | | | | Add support for mount options to API
| * | Add support for mount options to APIJhon Honce2021-08-27
| |/ | | | | | | | | | | | | | | When creating containers the specialized mount options where not populated via the API. Fixes: #10831 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | Merge pull request #11333 from rhatdan/http-proxyOpenShift Merge Robot2021-08-27
|\ \ | | | | | | Globally replace http:// with https://
| * | Globally replace http:// with https://Daniel J Walsh2021-08-27
| | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] Hopefully existing tests will find issues. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #11339 from rhatdan/subidOpenShift Merge Robot2021-08-27
|\ \ \ | |_|/ |/| | Add support for libsubid
| * | Add support for libsubidDaniel J Walsh2021-08-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | This will enable remote access to /etc/subuid and /etc/subgid information from ldap services, if shadow-utils ships with a libsubid. [NO TESTS NEEDED] Since we have no way to test this. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #11102 from cdoern/infraEnhanceOpenShift Merge Robot2021-08-27
|\ \ \ | | | | | | | | InfraContainer Rework
| * | | InfraContainer Reworkcdoern2021-08-26
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | InfraContainer should go through the same creation process as regular containers. This change was from the cmd level down, involving new container CLI opts and specgen creating functions. What now happens is that both container and pod cli options are populated in cmd and used to create a podSpecgen and a containerSpecgen. The process then goes as follows FillOutSpecGen (infra) -> MapSpec (podOpts -> infraOpts) -> PodCreate -> MakePod -> createPodOptions -> NewPod -> CompleteSpec (infra) -> MakeContainer -> NewContainer -> newContainer -> AddInfra (to pod state) Signed-off-by: cdoern <cdoern@redhat.com>
* | | Merge pull request #11330 from ↵OpenShift Merge Robot2021-08-27
|\ \ \ | |_|/ |/| | | | | | | | containers/dependabot/go_modules/github.com/containers/image/v5-5.16.0 Bump github.com/containers/image/v5 from 5.15.2 to 5.16.0
| * | Bump github.com/containers/image/v5 from 5.15.2 to 5.16.0dependabot[bot]2021-08-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/image/v5](https://github.com/containers/image) from 5.15.2 to 5.16.0. - [Release notes](https://github.com/containers/image/releases) - [Commits](https://github.com/containers/image/compare/v5.15.2...v5.16.0) --- updated-dependencies: - dependency-name: github.com/containers/image/v5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #11337 from Luap99/anon-templateOpenShift Merge Robot2021-08-27
|\ \ \ | |_|/ |/| | Shell completion for --format with anonymous fields
| * | Shell completion for --format with anonymous fieldsPaul Holzinger2021-08-27
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit d81021ed265e I introduced shell completion for the `--format` flag. This is a very nice way to complete go template field names. However it did not work correct for anonymous fields. In this case the child fields can be accessed directly from the parent. For example: ``` type Anonymous struct { Field1 string Field2 string ... } type MyType struct { Anonymous } var s = MyType{} ``` Now if you want to access a field from the Anonymous struct you can just do `s.Field1`. The same is allowed for go templates, using `{{.Field1}}` should work. This commit adds this functionality, if the field is anonymous read the child field names recursively and add them to the suggestions. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | Merge pull request #11298 from baude/kubeupdownOpenShift Merge Robot2021-08-26
|\ \ | | | | | | teardown play kube
| * | Fix swagger issueJhon Honce2021-08-25
| | | | | | | | | | | | | | | | | | Add special case for op PlayKubeDownLibpod Heuristic for guessing swagger operation id too limited for PlayKubeDownLibpod Signed-off-by: Jhon Honce <jhonce@redhat.com>
| * | teardown play kubeBrent Baude2021-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | add the ability for play kube to tear down based on the yaml used to play it. it is indicated by --down in the play kube command. volumes are NOT deleted during the teardown. pods and their containers are stopped and removed. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #11318 from jmguzik/volume-ls-prune-docsOpenShift Merge Robot2021-08-26
|\ \ \ | | | | | | | | [CI:DOCS] Add filter params description to volume list/prune docs
| * | | Add filter params description to volume list/prune docsJakub Guzik2021-08-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Description adjusted to the standard seen in other man pages. [CI:DOCS] Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
* | | | Merge pull request #11208 from ashley-cui/streamsOpenShift Merge Robot2021-08-26
|\ \ \ \ | | | | | | | | | | [NO TESTS NEEDED] Allow setting of machine stream and image path from containers.conf
| * | | | Allow setting of machine stream and image path from containers.confAshley Cui2021-08-24
| |/ / / | | | | | | | | | | | | | | | | | | | | Default is "testing" Signed-off-by: Ashley Cui <acui@redhat.com>
* | | | Merge pull request #11218 from cdoern/untilBugOpenShift Merge Robot2021-08-26
|\ \ \ \ | | | | | | | | | | logFile until flag issue, negative duration replaced with positive
| * | | | logFile until flag issuecdoern2021-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we were adding a negative duration in podman events, causing inputs like -5s to be correct and 5s to be incorrect. fixes #11158 Signed-off-by: cdoern <cdoern@redhat.com>
* | | | | Merge pull request #11307 from flouthoc/volume-import-externalOpenShift Merge Robot2021-08-26
|\ \ \ \ \ | |_|_|_|/ |/| | | | volumes: Add support for `volume import` which allows importing contents of external tarballs into podman volumes.
| * | | | volumes: Add volume import to allow importing contents on tar into volumeflouthoc2021-08-26
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Following feature makes sure that users can load contents of external tarball into the podman volumes. Signed-off-by: flouthoc <flouthoc.git@gmail.com>
* | | | Merge pull request #11321 from ↵OpenShift Merge Robot2021-08-26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/fsnotify/fsnotify-1.5.1 Bump github.com/fsnotify/fsnotify from 1.4.9 to 1.5.1
| * | | | Bump github.com/fsnotify/fsnotify from 1.4.9 to 1.5.1dependabot[bot]2021-08-25
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/fsnotify/fsnotify](https://github.com/fsnotify/fsnotify) from 1.4.9 to 1.5.1. - [Release notes](https://github.com/fsnotify/fsnotify/releases) - [Changelog](https://github.com/fsnotify/fsnotify/blob/master/CHANGELOG.md) - [Commits](https://github.com/fsnotify/fsnotify/compare/v1.4.9...v1.5.1) --- updated-dependencies: - dependency-name: github.com/fsnotify/fsnotify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | Merge pull request #11103 from jwhonce/wip/bindingsOpenShift Merge Robot2021-08-25
|\ \ \ \ | | | | | | | | | | Fix file descriptor leaks in bindings and add test
| * | | | Fix file descriptor leaks and add testJhon Honce2021-08-24
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add response.Body.Close() where needed to release HTTP connections to API server. * Add tests to ensure no general leaks occur. 100% coverage would be required to ensure no leaks on any call. * Update code comments to be godoc correct Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #11314 from Luap99/expose-portsOpenShift Merge Robot2021-08-25
|\ \ \ \ | |_|/ / |/| | | podman inspect show exposed ports
| * | | podman inspect show exposed portsPaul Holzinger2021-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman inspect has to show exposed ports to match docker. This requires storing the exposed ports in the container config. A exposed port is shown as `"80/tcp": null` while a forwarded port is shown as `"80/tcp": [{"HostIp": "", "HostPort": "8080" }]`. Also make sure to add the exposed ports to the new image when the container is commited. Fixes #10777 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | Merge pull request #11263 from nalind/journal-readOpenShift Merge Robot2021-08-24
|\ \ \ \ | | | | | | | | | | libpod/Container.readFromJournal(): don't skip the first entry
| * | | | 130-kill.bats: increase timeouts from 10s to 60sNalin Dahyabhai2021-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the amount of time we're willing to wait for a log message that a container should be printing to show up in the output of `logs -f`, since on at least one CI configuration we're seeing a turnaround as high as 46s, but it's not something we can directly control, so that's not a hard maximum. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
| * | | | logs: adjust handling around partial log messagesNalin Dahyabhai2021-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In libpod/logs.LogLine.Write(), don't write a newline to stdout/stderr when the log message is only part of a line. In libpod.ConmonOCIRuntime.HTTPAttach(), don't send a newline over the HTTP connection when the log message is only part of a line. In pkg/api/handlers/compat.LogsFromContainer(), don't send a newline over the HTTP connection when the log message is only part of a line, and don't make doing so conditional on whether or not the client used the docker or podman endpoint. In pkg/domain/infra/tunnel.ContainerEngine.ContainerLogs(), don't add our own newline to log messages, since they already come through from the server when they need to. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>