chore: bump cluster install versions - #5771
Conversation
There was a problem hiding this comment.
Pull request overview
Updates the default OpenShift patch versions used when converting RP-provided X.Y versions into Cluster Service “openshift-vX.Y.Z” identifiers, aligning unit test expectations and default builders with the new patch levels.
Changes:
- Bump default stable patch versions for 4.20 and 4.21 (and associated expected values in tests).
- Update
NewOpenShiftVersionXYZ’s hardcoded X.Y→patch mapping to reflect the new defaults. - Refresh default cluster/nodepool version expectations in
internal/ocmtests.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| internal/ocm/convert_test.go | Updates expected CS version IDs and defaults to match the bumped patch versions. |
| internal/ocm/client.go | Updates the X.Y→patch mapping used to synthesize CS-readable version IDs. |
Manyanda Chitimbo (machi1990)
left a comment
There was a problem hiding this comment.
/lgtm
|
/lgtm cancel |
4291a09 to
f4e285f
Compare
|
/test e2e-parallel |
1 similar comment
|
/test e2e-parallel |
|
/lgtm |
Update install z-stream versions and add patch version for 4.22.
f4e285f to
1111c46
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
Comments suppressed due to low confidence (1)
internal/ocm/client.go:813
- When
vincludes a prerelease suffix but is still in X.Y format (e.g.4.22-0.nightly-...), the patch lookup uses the originalv(including the suffix) so it won’t match the map and will incorrectly fall back to patch0. SinceversionPartis already split out, the lookup key should be based on the parsed X.Y (and the comment referencing PR #4477 looks stale now that we still maintain an explicit mapping).
if len(parts) == 2 {
// Patch version is managed by Red Hat. This will be computed automatically to the latest
// as part of https://github.com/Azure/ARO-HCP/pull/4477
if patch, ok := map[string]string{"4.19": "34", "4.20": "25", "4.21": "20", "4.22": "1"}[v]; ok {
parts = append(parts, patch)
} else {
parts = append(parts, "0")
}
Manyanda Chitimbo (machi1990)
left a comment
There was a problem hiding this comment.
/lgtm
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: geoberle, JakobGray, machi1990 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 |
|
/test e2e-parallel |
1 similar comment
|
/test e2e-parallel |
|
/test e2e-parallel |
What
Update cluster install versions
Why
Use latest available z version
Testing
Special notes for your reviewer
PR Checklist