Update RKE2 ClusterClass to v1beta2 and bump provider to v0.24.3#6279
Merged
Merged
Conversation
Contributor
Author
|
/test pull-cluster-api-provider-azure-e2e-optional |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #6279 +/- ##
=======================================
Coverage 43.88% 43.88%
=======================================
Files 289 289
Lines 25351 25351
=======================================
Hits 11125 11125
Misses 13448 13448
Partials 778 778 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Contributor
Author
|
/retest |
Contributor
|
LGTM label has been added. DetailsGit tree hash: f3c55d404c8f159a0b5ef95bdc8b8b0e2ffdbbc1 |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: willie-yao 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind failing-test
What this PR does / why we need it:
The RKE2 clusterclass e2e test is currently pinned to RKE2 provider
v0.21.1because newer versions changed the schema forRKE2ControlPlaneTemplateandRKE2ConfigTemplate. Specifically,rancher/cluster-api-provider-rke2#793and#794(released in v0.22.0) introduced av1beta2API and the v1beta2 contract:RKE2ControlPlane.spec.machineTemplateis no longer the InfrastructureRef container itself, but now wraps aSpecfield that holdsinfrastructureRef(of typeContractVersionedObjectReference). CAPI v1.13's topology controller writes against this new contract and produced the schema error reported in #6081.This PR updates our RKE2 clusterclass templates to use the
v1beta2API for RKE2 types and bumps the pinned provider version tov0.24.3(latest stable):RKE2ControlPlaneTemplateandRKE2ConfigTemplateapiVersions changed fromv1beta1tov1beta2in both base flavor (templates/flavors/clusterclass-rke2/) and the CI overlay (templates/test/ci/prow-clusterclass-ci-rke2/).controlPlane.refand workerbootstrap.refupdated tov1beta2for the RKE2 types. The ClusterClass itself stays oncluster.x-k8s.io/v1beta1, matching the rest of CAPZ.v1beta2.azure_test.goupdated to v1beta2.v0.21.1tov0.24.3.make generate-flavors.The patches that reference built-in topology variables (
{{ .builtin.controlPlane.machineTemplate.infrastructureRef.name }},{{ .builtin.machineDeployment.infrastructureRef.name }}) are unchanged — those built-in names persist across the contract version.Which issue(s) this PR fixes:
Fixes #6081
Special notes for your reviewer:
The actual validation of this fix is
pull-cluster-api-provider-azure-e2e-optional. Local checks (go vet -tags=e2e,make lint,make generate) all pass cleanly.This effectively reverts the temporary pin in #6085 while raising the pin to a maintained release.
TODOs:
Release note: