use v1beta2 in runtime extension

sivchari · sivchari · commit 8a107d958e63 · 2025-07-07T12:12:29.000+09:00
Signed-off-by: sivchari &lt;shibuuuu5@gmail.com&gt;
diff --git a/test/e2e/data/infrastructure-docker/main/bases/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-docker/main/bases/cluster-with-kcp.yaml
@@ -6,21 +6,21 @@ metadata:
   name: '${CLUSTER_NAME}'
 spec:
   failureDomains:
-    fd1:
+    - name: fd1
       controlPlane: true
-    fd2:
+    - name: fd2
       controlPlane: true
-    fd3:
+    - name: fd3
       controlPlane: true
-    fd4:
+    - name: fd4
       controlPlane: false
-    fd5:
+    - name: fd5
       controlPlane: false
-    fd6:
+    - name: fd6
       controlPlane: false
-    fd7:
+    - name: fd7
       controlPlane: false
-    fd8:
+    - name: fd8
       controlPlane: false
 ---
 # Cluster object with
@@ -40,12 +40,12 @@ spec:
       cidrBlocks: ['${DOCKER_POD_CIDRS}']
     serviceDomain: '${DOCKER_SERVICE_DOMAIN}'
   infrastructureRef:
-    apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+    apiGroup: infrastructure.cluster.x-k8s.io
     kind: DockerCluster
     name: '${CLUSTER_NAME}'
   controlPlaneRef:
     kind: KubeadmControlPlane
-    apiVersion: controlplane.cluster.x-k8s.io/v1beta2
+    apiGroup: controlplane.cluster.x-k8s.io
     name: "${CLUSTER_NAME}-control-plane"
 ---
 # DockerMachineTemplate object referenced by the KubeadmControlPlane object
@@ -75,7 +75,7 @@ spec:
   machineTemplate:
     infrastructureRef:
       kind: DockerMachineTemplate
-      apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+      apiGroup: infrastructure.cluster.x-k8s.io
       name: "${CLUSTER_NAME}-control-plane"
   kubeadmConfigSpec:
     clusterConfiguration:
diff --git a/test/e2e/data/infrastructure-docker/main/bases/cluster-with-topology.yaml b/test/e2e/data/infrastructure-docker/main/bases/cluster-with-topology.yaml
@@ -67,7 +67,7 @@ spec:
         minReadySeconds: 5
         replicas: ${WORKER_MACHINE_COUNT}
         failureDomains:
-        - fd4
+          - name: fd4
     variables:
       # We set an empty value to use the default tag kubeadm init is using.
     - name: etcdImageTag
diff --git a/test/e2e/data/infrastructure-docker/main/bases/md.yaml b/test/e2e/data/infrastructure-docker/main/bases/md.yaml
@@ -42,10 +42,10 @@ spec:
       bootstrap:
         configRef:
           name: "${CLUSTER_NAME}-md-0"
-          apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
+          apiGroup: bootstrap.cluster.x-k8s.io
           kind: KubeadmConfigTemplate
       infrastructureRef:
         name: "${CLUSTER_NAME}-md-0"
-        apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+        apiGroup: infrastructure.cluster.x-k8s.io
         kind: DockerMachineTemplate
       failureDomain: fd4
diff --git a/test/e2e/data/infrastructure-docker/main/bases/mp.yaml b/test/e2e/data/infrastructure-docker/main/bases/mp.yaml
@@ -11,21 +11,21 @@ spec:
     spec:
       bootstrap:
         configRef:
-          apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
+          apiGroup: bootstrap.cluster.x-k8s.io
           kind: KubeadmConfig
           name: "${CLUSTER_NAME}-mp-0-config"
       clusterName: '${CLUSTER_NAME}'
       infrastructureRef:
-        apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+        apiGroup: infrastructure.cluster.x-k8s.io/v1beta2
         kind: DockerMachinePool
         name: "${CLUSTER_NAME}-dmp-0"
       version: "${KUBERNETES_VERSION}"
   failureDomains:
-    - fd4
-    - fd5
-    - fd6
-    - fd7
-    - fd8
+    - name: fd4
+    - name: fd5
+    - name: fd6
+    - name: fd7
+    - name: fd8
 ---
 # DockerMachinePool using default values referenced by the MachinePool
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
diff --git a/test/e2e/data/infrastructure-docker/main/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml b/test/e2e/data/infrastructure-docker/main/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml
@@ -22,7 +22,7 @@ spec:
       cidrBlocks: ['${DOCKER_POD_CIDRS}']
     serviceDomain: '${DOCKER_SERVICE_DOMAIN}'
   infrastructureRef:
-    apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+    apiGroup: infrastructure.cluster.x-k8s.io
     kind: DockerCluster
     name: '${CLUSTER_NAME}'
 ---
@@ -60,9 +60,9 @@ spec:
   bootstrap:
     configRef:
       name: "${ CLUSTER_NAME }-control-plane-0"
-      apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
+      apiGroup: bootstrap.cluster.x-k8s.io
       kind: KubeadmConfig
   infrastructureRef:
     name: "${ CLUSTER_NAME }-control-plane-0"
-    apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+    apiGroup: infrastructure.cluster.x-k8s.io
     kind: DockerMachine
diff --git a/test/e2e/data/infrastructure-docker/main/cluster-template-kcp-remediation/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-docker/main/cluster-template-kcp-remediation/cluster-with-kcp.yaml
@@ -22,12 +22,12 @@ spec:
       cidrBlocks: ['${DOCKER_POD_CIDRS}']
     serviceDomain: '${DOCKER_SERVICE_DOMAIN}'
   infrastructureRef:
-    apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+    apiGroup: infrastructure.cluster.x-k8s.io
     kind: DockerCluster
     name: '${CLUSTER_NAME}'
   controlPlaneRef:
     kind: KubeadmControlPlane
-    apiVersion: controlplane.cluster.x-k8s.io/v1beta2
+    apiGroup: controlplane.cluster.x-k8s.io
     name: "${CLUSTER_NAME}-control-plane"
 ---
 # DockerMachineTemplate object referenced by the KubeadmControlPlane object
@@ -50,7 +50,7 @@ spec:
   machineTemplate:
     infrastructureRef:
       kind: DockerMachineTemplate
-      apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+      apiGroup: infrastructure.cluster.x-k8s.io
       name: "${CLUSTER_NAME}-control-plane"
   kubeadmConfigSpec:
     clusterConfiguration:
diff --git a/test/e2e/data/infrastructure-docker/main/cluster-template-upgrades-runtimesdk/cluster-runtimesdk.yaml b/test/e2e/data/infrastructure-docker/main/cluster-template-upgrades-runtimesdk/cluster-runtimesdk.yaml
@@ -37,7 +37,7 @@ spec:
           minReadySeconds: 5
           replicas: ${WORKER_MACHINE_COUNT}
           failureDomains:
-          - fd4
+            - name: fd4
     variables:
       - name: kubeadmControlPlaneMaxSurge
         value: "1"
diff --git a/test/e2e/data/infrastructure-docker/main/clusterclass-in-memory.yaml b/test/e2e/data/infrastructure-docker/main/clusterclass-in-memory.yaml
@@ -109,11 +109,11 @@ spec:
       annotations:
     machineInfrastructure:
       ref:
-        apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+        apiGroup: infrastructure.cluster.x-k8s.io
         kind: DevMachineTemplate
         name: in-memory-control-plane
     ref:
-      apiVersion: controlplane.cluster.x-k8s.io/v1beta2
+      apiGroup: controlplane.cluster.x-k8s.io
       kind: KubeadmControlPlaneTemplate
       name: in-memory-control-plane
     machineHealthCheck:
@@ -126,7 +126,7 @@ spec:
           timeout: 300s
   infrastructure:
     ref:
-      apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+      apiGroup: infrastructure.cluster.x-k8s.io
       kind: DevClusterTemplate
       name: in-memory-cluster
   workers:
@@ -135,12 +135,12 @@ spec:
         template:
           bootstrap:
             ref:
-              apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
+              apiGroup: bootstrap.cluster.x-k8s.io
               kind: KubeadmConfigTemplate
               name: in-memory-default-worker-bootstraptemplate
           infrastructure:
             ref:
-              apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+              apiGroup: infrastructure.cluster.x-k8s.io
               kind: DevMachineTemplate
               name: in-memory-default-worker-machinetemplate
         machineHealthCheck:
diff --git a/test/e2e/data/infrastructure-docker/main/clusterclass-quick-start-runtimesdk.yaml b/test/e2e/data/infrastructure-docker/main/clusterclass-quick-start-runtimesdk.yaml
@@ -5,19 +5,19 @@ metadata:
 spec:
   controlPlane:
     ref:
-      apiVersion: controlplane.cluster.x-k8s.io/v1beta2
+      apiGroup: controlplane.cluster.x-k8s.io
       kind: KubeadmControlPlaneTemplate
       name: quick-start-control-plane
     machineInfrastructure:
       ref:
         kind: DockerMachineTemplate
-        apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+        apiGroup: infrastructure.cluster.x-k8s.io
         name: quick-start-control-plane
     namingStrategy:
       template: "{{ .cluster.name }}-cp-{{ .random }}"
   infrastructure:
     ref:
-      apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+      apiGroup: infrastructure.cluster.x-k8s.io
       kind: DockerClusterTemplate
       name: quick-start-cluster
   infrastructureNamingStrategy:
@@ -30,12 +30,12 @@ spec:
       template:
         bootstrap:
           ref:
-            apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
+            apiGroup: bootstrap.cluster.x-k8s.io
             kind: KubeadmConfigTemplate
             name: quick-start-default-worker-bootstraptemplate
         infrastructure:
           ref:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+            apiGroup: infrastructure.cluster.x-k8s.io
             kind: DockerMachineTemplate
             name: quick-start-default-worker-machinetemplate
     machinePools:
@@ -45,12 +45,12 @@ spec:
       template:
         bootstrap:
           ref:
-            apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
+            apiGroup: bootstrap.cluster.x-k8s.io
             kind: KubeadmConfigTemplate
             name: quick-start-default-worker-bootstraptemplate
         infrastructure:
           ref:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+            apiGroup: infrastructure.cluster.x-k8s.io
             kind: DockerMachinePoolTemplate
             name: quick-start-default-worker-machinepooltemplate
   patches:
diff --git a/test/e2e/data/infrastructure-docker/main/clusterclass-quick-start.yaml b/test/e2e/data/infrastructure-docker/main/clusterclass-quick-start.yaml
@@ -10,13 +10,13 @@ spec:
       annotations:
         ClusterClass.controlPlane.annotation: "ClusterClass.controlPlane.annotationValue"
     ref:
-      apiVersion: controlplane.cluster.x-k8s.io/v1beta2
+      apiGroup: controlplane.cluster.x-k8s.io
       kind: KubeadmControlPlaneTemplate
       name: quick-start-control-plane
     machineInfrastructure:
       ref:
         kind: DockerMachineTemplate
-        apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+        apiGroup: infrastructure.cluster.x-k8s.io
         name: quick-start-control-plane
     machineHealthCheck:
       maxUnhealthy: 100%
@@ -26,7 +26,7 @@ spec:
           timeout: 20s
   infrastructure:
     ref:
-      apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+      apiGroup: infrastructure.cluster.x-k8s.io
       kind: DockerClusterTemplate
       name: quick-start-cluster
   workers:
@@ -40,12 +40,12 @@ spec:
             ClusterClass.machineDeployment.annotation: "ClusterClass.machineDeployment.annotationValue"
         bootstrap:
           ref:
-            apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
+            apiGroup: bootstrap.cluster.x-k8s.io
             kind: KubeadmConfigTemplate
             name: quick-start-md-default-worker-bootstraptemplate
         infrastructure:
           ref:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+            apiGroup: infrastructure.cluster.x-k8s.io
             kind: DockerMachineTemplate
             name: quick-start-default-worker-machinetemplate
       machineHealthCheck:
@@ -61,12 +61,12 @@ spec:
             ClusterClass.machinePool.annotation: "ClusterClass.machinePool.annotationValue"
         bootstrap:
           ref:
-            apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
+            apiGroup: bootstrap.cluster.x-k8s.io
             kind: KubeadmConfigTemplate
             name: quick-start-mp-default-worker-bootstraptemplate
         infrastructure:
           ref:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+            apiGroup: infrastructure.cluster.x-k8s.io
             kind: DockerMachinePoolTemplate
             name: quick-start-default-worker-machinepooltemplate
   variables:
diff --git a/test/extension/handlers/topologymutation/handler.go b/test/extension/handlers/topologymutation/handler.go
diff --git a/test/extension/handlers/topologymutation/handler_test.go b/test/extension/handlers/topologymutation/handler_test.go
diff --git a/test/extension/handlers/topologymutation/testdata/clusterclass-quick-start-runtimesdk.yaml b/test/extension/handlers/topologymutation/testdata/clusterclass-quick-start-runtimesdk.yaml
