Skip to content

chore: bump cluster install versions - #5771

Merged
openshift-merge-bot[bot] merged 1 commit into
Azure:mainfrom
JakobGray:z-bump
Jun 27, 2026
Merged

openshift-merge-bot[bot] merged 1 commit into
Azure:mainfrom
JakobGray:z-bump

Conversation

@JakobGray

Copy link
Copy Markdown
Collaborator

What

Update cluster install versions

Why

Use latest available z version

Testing

Special notes for your reviewer

PR Checklist

  • PR is scoped to a single task (no mixed concerns)
  • Title follows Conventional Commits format
  • Summary explains the "Why" behind the change
  • Linked to relevant ticket/issue
  • Screenshots included (if graph/UI/metrics changes)
  • Self-reviewed the diff
  • CI/CD checks are passing (ignore Tide)
  • Draft PR used for WIP (if applicable)
  • Commit history is clean (rebased/squashed)
  • Tricky code blocks are commented
  • Specific reviewers tagged
  • All comment threads resolved before merge

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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/ocm tests.

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.

Comment thread internal/ocm/client.go Outdated

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

/lgtm

Comment thread internal/ocm/client.go Outdated
@machi1990

Copy link
Copy Markdown
Collaborator

/lgtm cancel

@JakobGray

Copy link
Copy Markdown
Collaborator Author

/test e2e-parallel

1 similar comment
@JakobGray

Copy link
Copy Markdown
Collaborator Author

/test e2e-parallel

@machi1990

Copy link
Copy Markdown
Collaborator

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Jun 26, 2026
Comment thread internal/ocm/client.go Outdated
Update install z-stream versions and add patch version for 4.22.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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 v includes a prerelease suffix but is still in X.Y format (e.g. 4.22-0.nightly-...), the patch lookup uses the original v (including the suffix) so it won’t match the map and will incorrectly fall back to patch 0. Since versionPart is 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")
			}

Comment thread internal/ocm/convert_test.go

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Jun 26, 2026
@geoberle

Copy link
Copy Markdown
Collaborator

/approve

@openshift-ci

openshift-ci Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

[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

Details 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

@JakobGray

Copy link
Copy Markdown
Collaborator Author

/test e2e-parallel

1 similar comment
@JakobGray

Copy link
Copy Markdown
Collaborator Author

/test e2e-parallel

@JakobGray

Copy link
Copy Markdown
Collaborator Author

/test e2e-parallel

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 30228fa and 2 for PR HEAD 1111c46 in total

@openshift-merge-bot
openshift-merge-bot Bot merged commit 2d65e07 into Azure:main Jun 27, 2026
16 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.

4 participants