summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix ip-range for classless subnet masksPaul Holzinger2020-11-23
| | | | | | | | | | | The `LastIPInSubnet` function worked only for classful subnet masks (e.g. /8, /16, /24). For non standard subnet masks this returned the wrong ip address. This works now for all subnet mask. A unit test is added to ensure this. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* Merge pull request #8429 from psakar/fix-json-capabilitiesOpenShift Merge Robot2020-11-21
|\ | | | | APIv2 - strip CAP_ prefix from capabilities in inspect container json
| * APIv2 - strip CAP_ prefix from capabilities in jsonPetr Sakař2020-11-20
| | | | | | | | | | | | strip prefix "CAP_" from capabilities in json generated by container inspect operation Signed-off-by: Petr Sakař <petr.sakar@chare.eu>
* | Merge pull request #8410 from Luap99/fix-multiple-networksOpenShift Merge Robot2020-11-21
|\ \ | | | | | | Allow multiple --network flags for podman run/create
| * | Allow multiple --network flags for podman run/createPaul Holzinger2020-11-20
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | We allow a container to be connected to several cni networks but only if they are listed comma sperated. This is not intuitive for users especially since the flag parsing allows multiple string flags but only would take the last value. see: spf13/pflag#72 Also get rid of the extra parsing logic for pods. The invalid options are already handled by `pkg/specgen`. A test is added to prevent a future regression. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #8435 from FreedomBen/fix-replace-command-typoOpenShift Merge Robot2020-11-21
|\ \ | | | | | | Specify what the replace flag replaces in help text
| * | Specify what the replace flag replaces in help textBenjamin Porter2020-11-20
|/ / | | | | | | | | | | | | | | | | | | The word "name" appears to have been missed in the help output for: podman pod create --help This patch fixes that Signed-off-by: Benjamin Porter <FreedomBen@users.noreply.github.com>
* | Merge pull request #8431 from mheon/networks_returns_defaultOpenShift Merge Robot2020-11-20
|\ \ | | | | | | Make c.networks() list include the default network
| * | Make c.networks() list include the default networkMatthew Heon2020-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes things a lot more clear - if we are actually joining a CNI network, we are guaranteed to get a non-zero length list of networks. We do, however, need to know if the network we are joining is the default network for inspecting containers as it determines how we populate the response struct. To handle this, add a bool to indicate that the network listed was the default network, and only the default network. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #8423 from psakar/fix-8418OpenShift Merge Robot2020-11-20
|\ \ \ | |/ / |/| | REST API v2 - list of images - mandatory Created attribute
| * | REST API v2 - list of images - mandatory Created attributePetr Sakař2020-11-20
| |/ | | | | | | | | | | | | | | fixes https://github.com/containers/podman/issues/8418 created attribute is missing for images with created datetime set to 0 Unix time (January 1, 1970 UTC) because 0 is considered as default value, and thus attribute was ommited because of 'omitempty' flag Signed-off-by: Petr Sakař <petr.sakar@chare.eu>
* | Merge pull request #8406 from jwhonce/issues/8390OpenShift Merge Robot2020-11-20
|\ \ | | | | | | Make podman service log events
| * | Make podman service log eventsJhon Honce2020-11-19
| |/ | | | | | | | | | | | | | | | | * Log endpoint calls at level Info * Ensure API server started at level Info Fixes #8390 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | Merge pull request #8285 from rhatdan/containers.confOpenShift Merge Robot2020-11-20
|\ \ | | | | | | Document containers.conf settings for remote connections
| * | Document containers.conf settings for remote connectionsDaniel J Walsh2020-11-19
| |/ | | | | | | | | | | | | | | | | | | Currently we don't document which end of the podman-remote client server operations uses the containers.conf. This PR begins documenting this and then testing to make sure the defaults follow the rules. Fixes: https://github.com/containers/podman/issues/7657 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #8413 from rhatdan/VENDOROpenShift Merge Robot2020-11-20
|\ \ | | | | | | vendor in containers/storage v1.24.1
| * | vendor in containers/storage v1.24.1 containers/image v5.8.1Daniel J Walsh2020-11-19
| |/ | | | | | | | | | | These vendors fix the handling of homedirs. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #8422 from vrothberg/cgroup-fixOpenShift Merge Robot2020-11-20
|\ \ | | | | | | fix container cgroup lookup
| * | fix container cgroup lookupValentin Rothberg2020-11-20
| |/ | | | | | | | | | | | | | | | | | | | | | | | | When running on cgroups v1, `/proc/{PID}/cgroup` has multiple entries, each pointing potentially to a different cgroup. Some may be empty, some may point to parents. The one we really need is the libpod-specific one, which always is the longest path. So instead of looking at the first entry, look at all and select the longest one. Fixes: #8397 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #8404 from rhatdan/rmOpenShift Merge Robot2020-11-20
|\ \ | |/ |/| Add alias for podman network rm -> remove
| * Add alias for podman network rm -> removeDaniel J Walsh2020-11-19
| | | | | | | | | | | | | | | | docker network remove exists and is alias to docker network rm. Bug for bug compatible. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #8398 from Luap99/ps-filter-completionsOpenShift Merge Robot2020-11-19
|\ \ | | | | | | Shell completion for podman ps and podman pod ps --filter
| * | Shell completion for podman ps and podman pod ps --filterPaul Holzinger2020-11-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add all available filter options for `podman ps` and `podman pod ps` to the completions. Refactor the code a bit to make it easier to handle key value pairs in completions. The `completeKeyValues` function helps to reduce code duplication. Also make use of the new filter logic in the completions. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | Merge pull request #7958 from cevich/branch_fail_noticeOpenShift Merge Robot2020-11-19
|\ \ \ | | | | | | | | [ci-skip] Github-Actions: Send e-mail on Cirrus cron failure
| * | | Github-Actions: Send e-mail on Cirrus cron failureChris Evich2020-11-18
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This repository has a number of automaticly triggered branch-level testing enabled. However, other than remembering to go look at a specific WebUI, there is no way for anybody to notice if/when these jobs fail. This commit introduces a github-action workflow which runs periodically, checking for failed cron-triggered Cirrus-CI jobs. When it finds any, it formats a simple report for e-mail delivery. The list of destination addresses is configurable at any time by merging changes to a simple CSV file. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #8391 from baude/networkconnectdisconnectOpenShift Merge Robot2020-11-19
|\ \ \ | |_|/ |/| | add network connect|disconnect compat endpoints
| * | add network connect|disconnect compat endpointsbaude2020-11-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #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