Skip to content

Update OpenShift 4.21 dependencies and default to Gen2 VM images#400

Merged
openshift-merge-bot[bot] merged 4 commits into
openshift:release-4.21from
yadneshk:ARO-26085-prepare-release-4.21
Apr 22, 2026
Merged

Update OpenShift 4.21 dependencies and default to Gen2 VM images#400
openshift-merge-bot[bot] merged 4 commits into
openshift:release-4.21from
yadneshk:ARO-26085-prepare-release-4.21

Conversation

@yadneshk
Copy link
Copy Markdown
Contributor

@yadneshk yadneshk commented Apr 20, 2026 •
edited
Loading

This PR updates the installer wrapper to OpenShift 4.21 and implements Gen2 VM image support:

Dependency Updates (4.21)

  • Updated dependencies to release-4.21 of openshift/installer
  • Fixed Go 1.25 compatibility by updating golang.org/x/tools via gotestsum
  • Migrated from deprecated ControlPlaneSubnet/ComputeSubnet fields to new Subnets field with SubnetSpec
  • Updated test expectations to match new YAML serialization (removed creationTimestamp: null)

SKU Changes

Fixes ARO-26085

@yadneshk
Update dependencies to 4.21 release
888d069 
- Set RELEASE to release-4.21 in hack/update-go-module-dependencies.sh
- Run ./hack/update-go-module-dependencies.sh
- Run "go mod vendor"
@openshift-ci openshift-ci Bot requested review from bennerv and rogbas April 20, 2026 12:06
@yadneshk
Fix tests after updating dependencies
74cfa63 
- make unit-test-go fails with "/go/pkg/mod/golang.org/x/tools@v0.19.0/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64)"

gotestsum v1.12.0 is pinned in .bingo/gotestsum.mod and it depends on an old version of golang.org/x/tools that's incompatible with Go 1.25
Update gotestsum to a newer version that's compatible with Go 1.25.

- Update generateconfig.go since ControlPlaneSubnet & ComputeSubnet are
  deprecated in 1.4.21 tag of openshift/installer with SubnetSpec
@yadneshk yadneshk force-pushed the ARO-26085-prepare-release-4.21 branch from 91779d4 to 74cfa63 Compare April 20, 2026 12:52
@yadneshk
Default to Gen2 images for OpenShift 4.20+ with fallback to Gen1
97375b6 
From 4.20 onwards, clusters will be deployed with V2 images.
If the selected SKU doesn't support it, then fallback to using V1 image.

Fixes ARO-23073
Signed-off-by: Yadnesh Kulkarni <ykulkarn@redhat.com>
@yadneshk yadneshk changed the title Release 4.21 Update OpenShift 4.21 dependencies and default to Gen2 VM images Apr 20, 2026
@yadneshk yadneshk force-pushed the ARO-26085-prepare-release-4.21 branch from b1736d3 to 13cd10e Compare April 21, 2026 04:55
@yadneshk yadneshk force-pushed the ARO-26085-prepare-release-4.21 branch from 13cd10e to abc7259 Compare April 21, 2026 06:57
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 21, 2026

@yadneshk: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions 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-sigs/prow repository. I understand the commands that are listed here.

@edisonLcardenas
Copy link
Copy Markdown
Contributor

edisonLcardenas commented Apr 22, 2026

I reviewed the files that were explicitly modified by Yadnesh. Looks good to me.

LGTM

edisonLcardenas
edisonLcardenas approved these changes Apr 22, 2026
View reviewed changes
Comment thread pkg/installer/generateconfig.go Outdated
Comment thread pkg/installer/generateconfig.go Outdated
Comment thread pkg/installer/generateconfig.go Outdated
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 22, 2026

@edisonLcardenas: changing LGTM is restricted to collaborators

Details

In response to this:

Instructions 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-sigs/prow repository.

@hawkowl
Copy link
Copy Markdown
Collaborator

hawkowl commented Apr 22, 2026

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 22, 2026
@hawkowl
Copy link
Copy Markdown
Collaborator

hawkowl commented Apr 22, 2026

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 22, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: edisonLcardenas, hawkowl, yadneshk

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 22, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit c771a14 into openshift:release-4.21 Apr 22, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bennerv bennerv Awaiting requested review from bennerv

@rogbas rogbas Awaiting requested review from rogbas

1 more reviewer

@edisonLcardenas edisonLcardenas edisonLcardenas approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@hawkowl hawkowl

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@yadneshk @edisonLcardenas @hawkowl