Switch CAPD+RKE2 e2e template to clusterclass

alexander-demicev · alexander-demicev · commit 1835c3c5e725 · 2025-03-18T16:05:05.000+01:00
Signed-off-by: Alexandr Demicev &lt;alexandr.demicev@suse.com&gt;
diff --git a/test/e2e/config/operator.yaml b/test/e2e/config/operator.yaml
@@ -42,6 +42,7 @@ variables:
   KUBERNETES_VERSION: "v1.31.4"
   KUBERNETES_MANAGEMENT_VERSION: "v1.31.4"
   RKE2_VERSION: "v1.31.4+rke2r1"
+  RKE2_CNI: "none"
 
   # AWS Configuration
   AWS_REGION: "eu-west-2"
diff --git a/test/e2e/data/cluster-templates/aws-ec2-kubeadm.yaml b/test/e2e/data/cluster-templates/aws-ec2-kubeadm.yaml
@@ -13,7 +13,7 @@ spec:
       cidrBlocks:
       - 192.168.0.0/16
   topology:
-    class: turtles
+    class: ${CLUSTER_NAME}
     controlPlane:
       replicas: ${CONTROL_PLANE_MACHINE_COUNT}
     variables:
@@ -35,24 +35,24 @@ spec:
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: ClusterClass
 metadata:
-  name: turtles
+  name: ${CLUSTER_NAME}
   namespace: ${NAMESPACE}
 spec:
   controlPlane:
     ref:
       apiVersion: controlplane.cluster.x-k8s.io/v1beta1
       kind: KubeadmControlPlaneTemplate
-      name: turtles-control-plane
+      name: ${CLUSTER_NAME}-control-plane
     machineInfrastructure:
       ref:
         kind: AWSMachineTemplate
         apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
-        name: turtles-control-plane
+        name: ${CLUSTER_NAME}-control-plane
   infrastructure:
     ref:
       apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
       kind: AWSClusterTemplate
-      name: turtles
+      name: ${CLUSTER_NAME}
   workers:
     machineDeployments:
       - class: default-worker
@@ -61,12 +61,12 @@ spec:
             ref:
               apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
               kind: KubeadmConfigTemplate
-              name: turtles-worker-bootstraptemplate
+              name: ${CLUSTER_NAME}-worker-bootstraptemplate
           infrastructure:
             ref:
               apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
               kind: AWSMachineTemplate
-              name: turtles-worker-machinetemplate
+              name: ${CLUSTER_NAME}-worker-machinetemplate
   variables:
     - name: region
       required: true
@@ -160,7 +160,7 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSClusterTemplate
 metadata:
-  name: turtles
+  name: ${CLUSTER_NAME}
   namespace: ${NAMESPACE}
 spec:
   template:
@@ -172,7 +172,7 @@ spec:
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
 kind: KubeadmControlPlaneTemplate
 metadata:
-  name: turtles-control-plane
+  name: ${CLUSTER_NAME}-control-plane
   namespace: ${NAMESPACE}
 spec:
   template:
@@ -199,7 +199,7 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSMachineTemplate
 metadata:
-  name: turtles-control-plane
+  name: ${CLUSTER_NAME}-control-plane
   namespace: ${NAMESPACE}
 spec:
   template:
@@ -213,7 +213,7 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSMachineTemplate
 metadata:
-  name: turtles-worker-machinetemplate
+  name: ${CLUSTER_NAME}-worker-machinetemplate
   namespace: ${NAMESPACE}
 spec:
   template:
@@ -227,7 +227,7 @@ spec:
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate
 metadata:
-  name: "turtles-worker-bootstraptemplate"
+  name: "${CLUSTER_NAME}-worker-bootstraptemplate"
   namespace: ${NAMESPACE}
 spec:
   template:
diff --git a/test/e2e/data/cluster-templates/docker-rke2.yaml b/test/e2e/data/cluster-templates/docker-rke2.yaml
@@ -1,15 +1,3 @@
-apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-kind: DockerCluster
-metadata:
-  name: ${CLUSTER_NAME}
-  namespace: ${NAMESPACE}
-  annotations:
-    "helm.sh/resource-policy": keep
-spec:
-  loadBalancer:
-    customHAProxyConfigTemplateRef:
-      name: ${CLUSTER_NAME}-lb-config
----
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster 
 metadata:
@@ -18,7 +6,7 @@ metadata:
   annotations:
     cluster-api.cattle.io/upstream-system-agent: "true"
   labels:
-    cni: ${CLUSTER_NAME}-crs-0
+    cni: kindnet
 spec:
   clusterNetwork:
     pods:
@@ -28,72 +16,152 @@ spec:
       cidrBlocks:
       - 10.10.0.0/16
     serviceDomain: cluster.local
-  controlPlaneRef:
-    apiVersion: controlplane.cluster.x-k8s.io/v1beta1
-    kind: RKE2ControlPlane
-    name: ${CLUSTER_NAME}-control-plane
-  infrastructureRef:
-    apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-    kind: DockerCluster
-    name: ${CLUSTER_NAME}
+  topology:
+    class: ${CLUSTER_NAME}
+    controlPlane:
+      replicas: ${CONTROL_PLANE_MACHINE_COUNT}
+    variables:
+    - name: rke2CNI
+      value: ${RKE2_CNI}
+    - name: dockerImage
+      value: kindest/node:${KUBERNETES_VERSION}
+    version: ${RKE2_VERSION}
+    workers:
+      machineDeployments:
+      - class: default-worker
+        name: md-0
+        replicas: ${WORKER_MACHINE_COUNT}
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: ClusterClass
+metadata:
+  name: ${CLUSTER_NAME}
+  namespace: ${NAMESPACE}
+spec:
+  infrastructure:
+    ref:
+      apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+      kind: DockerClusterTemplate
+      name: ${CLUSTER_NAME}
+  controlPlane:
+    ref:
+      apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+      kind: RKE2ControlPlaneTemplate
+      name: ${CLUSTER_NAME}-control-plane
+    machineInfrastructure:
+      ref:
+        kind: DockerMachineTemplate
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+        name: ${CLUSTER_NAME}-control-plane
+  workers:
+    machineDeployments:
+      - class: default-worker
+        template:
+          bootstrap:
+            ref:
+              apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+              kind: RKE2ConfigTemplate
+              name: ${CLUSTER_NAME}-worker-bootstraptemplate
+          infrastructure:
+            ref:
+              apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+              kind: DockerMachineTemplate
+              name: ${CLUSTER_NAME}-worker-machinetemplate
+  variables:
+    - name: rke2CNI
+      required: true
+      schema:
+        openAPIV3Schema:
+          type: string
+    - name: dockerImage
+      required: true
+      schema:
+        openAPIV3Schema:
+          type: string
+  patches:
+    - name: rke2CNI
+      definitions:
+        - selector:
+            apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+            kind: RKE2ControlPlaneTemplate
+            matchResources:
+              controlPlane: true
+          jsonPatches:
+            - op: add
+              path: /spec/template/spec/serverConfig/cni
+              valueFrom:
+                variable: rke2CNI
+    - name: dockerImage
+      definitions:
+        - selector:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: DockerMachineTemplate
+            matchResources:
+              controlPlane: true
+              machineDeploymentClass:
+                names:
+                  - default-worker
+          jsonPatches:
+            - op: add
+              path: /spec/template/spec/customImage
+              valueFrom: 
+                variable: dockerImage
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-kind: DockerMachineTemplate
+kind: DockerClusterTemplate
 metadata:
-  name:  ${CLUSTER_NAME}-control-plane
+  name: ${CLUSTER_NAME}
   namespace: ${NAMESPACE}
 spec:
-  template:
-    spec:
-      customImage: kindest/node:${KUBERNETES_VERSION}
-      bootstrapTimeout: 15m
+  loadBalancer:
+    customHAProxyConfigTemplateRef:
+      name: ${CLUSTER_NAME}-lb-config
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
-kind: RKE2ControlPlane
+kind: RKE2ControlPlaneTemplate
 metadata:
   name: ${CLUSTER_NAME}-control-plane
   namespace: ${NAMESPACE}
 spec:
-  replicas: ${CONTROL_PLANE_MACHINE_COUNT}
-  version: ${RKE2_VERSION}
-  rolloutStrategy:
-    rollingUpdate:
-      maxSurge: 1
-    type: RollingUpdate
-  serverConfig:
-    cloudProviderName: external
-    cni: ${RKE2_CNI}
-    kubeAPIServer:
-      extraArgs:
-      - --anonymous-auth=true
-    disableComponents:
-      pluginComponents:
-       - rke2-ingress-nginx
-      kubernetesComponents:
-      - cloudController
-    etcd:
-      backupConfig:
-        scheduleCron: '*/5 * * * *'
-        retention: "1"
-  agentConfig:
-    nodeAnnotations:
-      test: "true"
-  machineTemplate:
-    infrastructureRef:
-      apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-      kind: DockerMachineTemplate
-      name:  ${CLUSTER_NAME}-control-plane
-    nodeDrainTimeout: 30s
-  infrastructureRef:
-    apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-    kind: DockerMachineTemplate
-    name:  ${CLUSTER_NAME}-control-plane
-  nodeDrainTimeout: 30s  
+  template:
+    spec:
+      rolloutStrategy:
+        rollingUpdate:
+          maxSurge: 1
+        type: RollingUpdate
+      serverConfig:
+        cloudProviderName: external
+        kubeAPIServer:
+          extraArgs:
+          - --anonymous-auth=true
+        disableComponents:
+          pluginComponents:
+          - rke2-ingress-nginx
+          kubernetesComponents:
+          - cloudController
+        etcd:
+          backupConfig:
+            scheduleCron: '*/5 * * * *'
+            retention: "1"
+      agentConfig:
+        nodeAnnotations:
+          test: "true"
+      nodeDrainTimeout: 30s
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: DockerMachineTemplate
 metadata:
-  name: ${CLUSTER_NAME}-md-0
+  name:  ${CLUSTER_NAME}-control-plane
+  namespace: ${NAMESPACE}
+spec:
+  template:
+    spec:
+      bootstrapTimeout: 15m  
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: DockerMachineTemplate
+metadata:
+  name: ${CLUSTER_NAME}-worker-machinetemplate
   namespace: ${NAMESPACE}
 spec:
   template:
@@ -104,35 +172,10 @@ spec:
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: RKE2ConfigTemplate
 metadata:
-  name: ${CLUSTER_NAME}-md-0
+  name: ${CLUSTER_NAME}-worker-bootstraptemplate
   namespace: ${NAMESPACE}
 spec: {}
 ---
-apiVersion: cluster.x-k8s.io/v1beta1
-kind: MachineDeployment
-metadata:
-  name: ${CLUSTER_NAME}-md-0
-  namespace: ${NAMESPACE}
-spec:
-  clusterName: ${CLUSTER_NAME}
-  replicas: ${WORKER_MACHINE_COUNT}
-  selector:
-    matchLabels:
-      cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
-  template:
-    spec:
-      version: ${RKE2_VERSION}
-      clusterName: ${CLUSTER_NAME}
-      bootstrap:
-        configRef:
-          apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
-          kind: RKE2ConfigTemplate
-          name: ${CLUSTER_NAME}-md-0
-      infrastructureRef:
-        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-        kind: DockerMachineTemplate
-        name: ${CLUSTER_NAME}-md-0
----
 apiVersion: v1
 data:
   value: |-
diff --git a/test/e2e/data/cni/kindnet.yaml b/test/e2e/data/cni/kindnet.yaml
@@ -127,4 +127,4 @@ spec:
   targets:
   - clusterSelector:
       matchLabels:
-        cni: ${CLUSTER_NAME}-crs-0
+        cni: kindnet
diff --git a/test/e2e/specs/import_gitops_mgmtv3.go b/test/e2e/specs/import_gitops_mgmtv3.go
@@ -244,7 +244,6 @@ func CreateMgmtV3UsingGitOpsSpec(ctx context.Context, inputGetter func() CreateM
 			"CLUSTER_CLASS_NAME":          fmt.Sprintf("%s-class", input.ClusterName),
 			"WORKER_MACHINE_COUNT":        strconv.Itoa(workerMachineCount),
 			"CONTROL_PLANE_MACHINE_COUNT": strconv.Itoa(controlPlaneMachineCount),
-			"RKE2_CNI":                    "none",
 		}
 
 		for k, v := range input.AdditionalTemplateVariables {

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,6 @@ func CreateMgmtV3UsingGitOpsSpec(ctx context.Context, inputGetter func() CreateM`
`244`	`244`	`"CLUSTER_CLASS_NAME": fmt.Sprintf("%s-class", input.ClusterName),`
`245`	`245`	`"WORKER_MACHINE_COUNT": strconv.Itoa(workerMachineCount),`
`246`	`246`	`"CONTROL_PLANE_MACHINE_COUNT": strconv.Itoa(controlPlaneMachineCount),`
`247`		`- "RKE2_CNI": "none",`
`248`	`247`	`}`
`249`	`248`
`250`	`249`	`for k, v := range input.AdditionalTemplateVariables {`