Update version detection and make dnsVIP conditional #1146
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Author
|
/cc @andfasano @stbenjam |
hardys
commented
Nov 9, 2020
andfasano
reviewed
Nov 10, 2020
|
@hardys: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Member
|
/approve |
openshift-ci-robot
added
the
approved
zaneb
reviewed
Nov 20, 2020
| apiVIP: ${API_VIP} | ||
| ingressVIP: ${INGRESS_VIP} | ||
| dnsVIP: ${DNS_VIP} | ||
| $(dnsvip) |
Member
There was a problem hiding this comment.
Might be safer to do the indentation here rather than in the function.
Author
There was a problem hiding this comment.
Yeah I did think the same but all of the other functions adding install-config snippets work like this so I decided to align for consistency.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: stbenjam, 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 |
We retrive this several times, so caching locally will be faster, and also provides a useful reference for debugging
andfasano
reviewed
Nov 24, 2020
added 2 commits
November 24, 2020 10:25
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.
This was removed in openshift/installer#3304
Member
|
/lgtm |
Avielyo10
pushed a commit
to Avielyo10/dev-scripts
that referenced
this pull request
Dec 2, 2020
* 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates detection of the openshift version because although users can set OPENSHIFT_VERSION, and we can derive it from most user specified release versions, the release images generated in CI don't work because they look like
registry.build02.ci.openshift.org/ci-op-xyzInstead we can save the release info locally, and look at the release version directly, which should result in version logic that works both for local testing and in CI.