Account for podman version < 2.0.0 #1151
Conversation
The default for CentOS 8 is 1.6.4 which does not support units in `podman wait -i`. Add a version check to support both. Follow-up to commit 42af610.
dtantsur
force-pushed
the
podman-version
branch
from
7570b25 to
ec32bb9
Compare
|
/approve |
openshift-ci-robot
added
the
approved
|
/cc @stbenjam this looks like a reasonable interim workaround? |
| early_deploy_validation | ||
|
|
||
| # Account for differences in 1.* and 2.* version reporting. | ||
| PODMAN_VERSION=$(sudo podman version -f json | jq -r '.Version,.Client.Version|strings') |
There was a problem hiding this comment.
Shorter version could be sudo podman version --format "{{.Version}}"
There was a problem hiding this comment.
The format argument to podman doesn't work on some versions.
There was a problem hiding this comment.
And it's .Client.Version on newer podmans..
There was a problem hiding this comment.
There's also a .Server.Version but it seems both are supported
| sudo podman wait -i 1000ms ipa-downloader | ||
| else | ||
| sudo podman wait -i 1000 ipa-downloader | ||
| fi |
There was a problem hiding this comment.
Question: do we really need to maintain the backward compatibility to a previous (major) version? Wouldn't be simpler to bump the podman min version required by dev-scripts?
There was a problem hiding this comment.
We do need to do this. CentOS doesn't have a podman that understands units, and RHEL 8.3 requires them.
There was a problem hiding this comment.
Ok got it just for this command , not in general
|
/lgtm |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: hardys, zaneb The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
* Simplify additional_trust_bundle() * Pass ca via path instead of via env vars Improve readability Fix loca-bmo script (openshift-metal3#1144) (openshift-metal3#1084) Co-authored-by: Andrea Fasano <60063538+andfasano@users.noreply.github.com> Fix incorrect group name (openshift-metal3#1155) `whoami` does not always match the group name for the user. Use `id -gn` to set the group name properly. Also create GROUP environment variable and replace USER where appropriate for chown commands. Signed-off-by: Melvin Hillsman <mrhillsman@redhat.com> Additional trust bundle (openshift-metal3#1152) * Adding the option to add certs to install-config.yaml * Add ADDITIONAL_TRUST_BUNDLE to the config_example.sh * Avoid additionalTrustBundle duplication & move from sed to awk When MIRROR_IMAGES is set or when using ipv6 (this is always true for ipv6) additionalTrustBundle section gets created, so give precedence to MIRROR_IMAGES CA * In case MIRROR_IMAGES is set, concat ADDITIONAL_TRUST_BUNDLE Co-authored-by: Aviel Yosef <ayosef@redhat.com> Account for podman version < 2.0.0 (openshift-metal3#1151) The default for CentOS 8 is 1.6.4 which does not support units in `podman wait -i`. Add a version check to support both. Follow-up to commit 42af610. Update version detection and make dnsVIP conditional (openshift-metal3#1146) * Store local copy of release info We retrive this several times, so caching locally will be faster, and also provides a useful reference for debugging * Replace OPENSHIFT_VERSION reference with function This variable isn't always set, in particular in CI, so instead of relying on it, we can use a new openshift_version function which derives the version from the locally cached release info. * Only specify dnsVIP for < 4.5 This was removed in openshift/installer#3304
7 participants
The default for CentOS 8 is 1.6.4 which does not support units
in
podman wait -i. Add a version check to support both.Follow-up to commit 42af610.