Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust machine sets to work on ocp 4.16 #483

Conversation

gparvin
Copy link
Member

@gparvin gparvin commented Jun 7, 2024

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:

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 <[email protected]>
@openshift-ci openshift-ci bot added the approved label Jun 7, 2024
@gparvin gparvin requested review from mprahl and JustinKuli and removed request for yiraeChristineKim June 7, 2024 19:58
@gparvin
Copy link
Member Author

gparvin commented Jun 10, 2024

Would like a review before end of day Tuesday if possible. Thanks!

Comment on lines +80 to +81
{{- $ocpversion := semver (fromClusterClaim "version.openshift.io") }}
{{- if gt $ocpversion.Minor 15 }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have semverCompare available--maybe use it directly?

Suggested change
{{- $ocpversion := semver (fromClusterClaim "version.openshift.io") }}
{{- if gt $ocpversion.Minor 15 }}
{{- semverCompare ">4.15" (fromClusterClaim "version.openshift.io") }}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, you're probably right. It probably should be ">=4.16"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works for me! And I guess the risk of bumping to OCP v5 is fairly low right now 🙂

Copy link

openshift-ci bot commented Jun 12, 2024

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit b006fcb into open-cluster-management-io:main Jun 12, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants