Adjust machine sets to work on ocp 4.16 #483
Conversation
The machineset no longer works on ocp 4.16. This pr adds in some filters which seem to be additional required configuration that resolves the issue. Refs: - https://issues.redhat.com/browse/OCPQE-22447 Signed-off-by: Gus Parvin <gparvin@redhat.com>
gparvin
requested review from
mprahl and
JustinKuli
and removed request for
yiraeChristineKim
|
Would like a review before end of day Tuesday if possible. Thanks! |
| {{- $ocpversion := semver (fromClusterClaim "version.openshift.io") }} | ||
| {{- if gt $ocpversion.Minor 15 }} |
There was a problem hiding this comment.
We have semverCompare available--maybe use it directly?
| {{- $ocpversion := semver (fromClusterClaim "version.openshift.io") }} | |
| {{- if gt $ocpversion.Minor 15 }} | |
| {{- semverCompare ">4.15" (fromClusterClaim "version.openshift.io") }} |
There was a problem hiding this comment.
I saw the semverCompare function, but I wasn't sure how it handled the patch release if you did a compare as described. I didn't play with it -- just went down the path that made sense at the moment. I'll test this some and see what happens.
There was a problem hiding this comment.
Oh, you're probably right. It probably should be ">=4.16"
There was a problem hiding this comment.
When I use any of the comparisons with 4.16.0-rc.2 builds the comparisons just don't seem to work. While it works fine if I change the comparison to run against just "4.16.0", I think I am leaning towards keeping the existing code rather than switch to semverCompare which appears to have trouble with some OCP versioning - even if these are rc builds.
There was a problem hiding this comment.
Works for me! And I guess the risk of bumping to OCP v5 is fairly low right now 🙂
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dhaiducek, gparvin The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-merge-bot
bot
merged commit b006fcb
into
open-cluster-management-io:main
The machineset no longer works on ocp 4.16. This pr adds in some filters which seem to be additional required configuration that resolves the issue.
Refs: