Skip to content

Update RKE2 ClusterClass to v1beta2 and bump provider to v0.24.3 #6279

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.

Sign up for GitHub

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

Merged
k8s-ci-robot merged 1 commit into from
May 6, 2026
Merged

Update RKE2 ClusterClass to v1beta2 and bump provider to v0.24.3 #6279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions templates/cluster-template-clusterclass-rke2.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions templates/flavors/clusterclass-rke2/clusterclass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
controlPlane:
ref:
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
kind: RKE2ControlPlaneTemplate
name: ${CLUSTER_NAME}-control-plane
machineInfrastructure:
Expand All @@ -24,7 +24,7 @@ spec:
template:
bootstrap:
ref:
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: RKE2ConfigTemplate
name: ${CLUSTER_NAME}-worker
infrastructure:
Expand Down Expand Up @@ -72,7 +72,7 @@ spec:
path: /etc/kubernetes/azure.json
permissions: "0644"
selector:
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: RKE2ConfigTemplate
matchResources:
machineDeploymentClass:
Expand All @@ -81,7 +81,7 @@ spec:
- name: azureMachineTemplate
definitions:
- selector:
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
kind: RKE2ControlPlaneTemplate
matchResources:
controlPlane: true
Expand Down
2 changes: 1 addition & 1 deletion templates/flavors/clusterclass-rke2/rke2-config-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: RKE2ConfigTemplate
metadata:
name: ${CLUSTER_NAME}-worker
Expand Down
2 changes: 1 addition & 1 deletion templates/flavors/clusterclass-rke2/rke2-controlplane-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
kind: RKE2ControlPlaneTemplate
metadata:
name: ${CLUSTER_NAME}-control-plane
Expand Down
12 changes: 6 additions & 6 deletions templates/test/ci/cluster-template-prow-clusterclass-ci-rke2.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions templates/test/ci/prow-clusterclass-ci-rke2/patches.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
template:
bootstrap:
ref:
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: RKE2ConfigTemplate
name: ${CLUSTER_NAME}-worker
infrastructure:
Expand All @@ -27,7 +27,7 @@ spec:
- name: controlPlaneAzureJsonSecretName
definitions:
- selector:
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
kind: RKE2ControlPlaneTemplate
matchResources:
controlPlane: true
Expand All @@ -46,7 +46,7 @@ spec:
- name: workerAzureJsonSecretName
definitions:
- selector:
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: RKE2ConfigTemplate
matchResources:
machineDeploymentClass:
Expand Down
2 changes: 1 addition & 1 deletion templates/test/ci/prow-clusterclass-ci-rke2/rke2-config-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: RKE2ConfigTemplate
metadata:
name: ${CLUSTER_NAME}-worker
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/azure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,7 @@ var _ = Describe("Workload cluster creation", func() {
clusterName = getClusterName(clusterNamePrefix, "cc")

// Init rke2 CP and bootstrap providers
rke2Version := "v0.21.1"
rke2Version := "v0.24.3"
initInput := clusterctl.InitInput{
// pass reference to the management cluster hosting this test
KubeconfigPath: bootstrapClusterProxy.GetKubeconfigPath(),
Expand All @@ -1075,7 +1075,7 @@ var _ = Describe("Workload cluster creation", func() {
//
// If that issue is resolved then we can remove this workaround.
objects, err := yaml.ToUnstructured([]byte(`
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
kind: RKE2ControlPlaneTemplate
metadata:
name: dry-run
Expand All @@ -1085,7 +1085,7 @@ spec:
spec:
rolloutStrategy: {}
---
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: RKE2ConfigTemplate
metadata:
name: dry-run
Expand Down
Loading