migrate definition to v2 specification

Signed-off-by: sivchari <shibuuuu5@gmail.com>

Author: sivchari

test/e2e/data/infrastructure-docker/main/bases/cluster-with-topology.yaml

@@ -27,8 +27,8 @@ spec:
           Cluster.topology.controlPlane.annotation: "Cluster.topology.controlPlane.annotationValue"
           # Note: this annotation is propagated to Nodes.
           Cluster.topology.controlPlane.annotation.node.cluster.x-k8s.io: "Cluster.topology.controlPlane.nodeAnnotationValue"
-      nodeDeletionTimeout: "30s"
-      nodeVolumeDetachTimeout: "5m"
+      nodeDeletionTimeoutSeconds: 30
+      nodeVolumeDetachTimeoutSeconds: 300
       replicas: ${CONTROL_PLANE_MACHINE_COUNT}
     workers:
       machineDeployments:
@@ -43,8 +43,8 @@ spec:
             Cluster.topology.machineDeployment.annotation: "Cluster.topology.machineDeployment.annotationValue"
             # Note: this annotation is propagated to Nodes. Shortened due to name length limitations
             Cluster.topology.md.annotation.node.cluster.x-k8s.io: "Cluster.topology.machineDeployment.nodeAnnotationValue"
-        nodeDeletionTimeout: "30s"
-        nodeVolumeDetachTimeout: "5m"
+        nodeDeletionTimeoutSeconds: 30
+        nodeVolumeDetachTimeoutSeconds: 300
         minReadySeconds: 5
         replicas: ${WORKER_MACHINE_COUNT}
         failureDomain: fd4
@@ -63,8 +63,8 @@ spec:
             Cluster.topology.machinePool.label.node.cluster.x-k8s.io: "Cluster.topology.machinePool.nodeLabelValue"
           annotations:
             Cluster.topology.machinePool.annotation: "Cluster.topology.machinePool.annotationValue"
-        nodeDeletionTimeout: "30s"
-        nodeVolumeDetachTimeout: "5m"
+        nodeDeletionTimeoutSeconds: 30
+        nodeVolumeDetachTimeoutSeconds: 300
         minReadySeconds: 5
         replicas: ${WORKER_MACHINE_COUNT}
         failureDomains:

test/e2e/data/infrastructure-docker/main/cluster-template-kcp-remediation/mhc.yaml

@@ -14,8 +14,8 @@ spec:
     matchLabels:
       cluster.x-k8s.io/control-plane: ""
       mhc-test: "fail"
-  nodeStartupTimeout: 30s
+  nodeStartupTimeoutSeconds: 30
   unhealthyConditions:
     - type: e2e.remediation.condition
       status: "False"
-      timeout: 10s
+      timeoutSeconds: 10

test/e2e/data/infrastructure-docker/main/cluster-template-md-remediation/mhc.yaml

@@ -15,4 +15,4 @@ spec:
   unhealthyConditions:
     - type: e2e.remediation.condition
       status: "False"
-      timeout: 10s
+      timeoutSeconds: 10

test/e2e/data/infrastructure-docker/main/cluster-template-topology-autoscaler/cluster-autoscaler.yaml

@@ -18,13 +18,13 @@ spec:
     version: "${KUBERNETES_VERSION}"
     controlPlane:
       metadata: {}
-      nodeDeletionTimeout: "30s"
+      nodeDeletionTimeoutSeconds: 30
       replicas: ${CONTROL_PLANE_MACHINE_COUNT}
     workers:
       machineDeployments:
         - class: "default-worker"
           name: "md-0"
-          nodeDeletionTimeout: "30s"
+          nodeDeletionTimeoutSeconds: 30
           failureDomain: fd4
           metadata:
             annotations:
@@ -33,7 +33,7 @@ spec:
       machinePools:
         - class: "default-worker"
           name: "mp-0"
-          nodeDeletionTimeout: "30s"
+          nodeDeletionTimeoutSeconds: 30
           failureDomains:
           - fd4
     variables:

test/e2e/data/infrastructure-docker/main/cluster-template-upgrades-runtimesdk/cluster-runtimesdk.yaml

@@ -19,22 +19,22 @@ spec:
     version: "${KUBERNETES_VERSION}"
     controlPlane:
       metadata: {}
-      nodeDeletionTimeout: "30s"
+      nodeDeletionTimeoutSeconds: 30
       replicas: ${CONTROL_PLANE_MACHINE_COUNT}
     workers:
       machineDeployments:
         - class: "default-worker"
           name: "md-0"
-          nodeDeletionTimeout: "30s"
-          nodeVolumeDetachTimeout: "5m"
+          nodeDeletionTimeoutSeconds: 30
+          nodeVolumeDetachTimeoutSeconds: 300
           minReadySeconds: 5
           replicas: ${WORKER_MACHINE_COUNT}
           failureDomain: fd4
       machinePools:
         - class: "default-worker"
           name: "mp-0"
-          nodeDeletionTimeout: "30s"
-          nodeVolumeDetachTimeout: "5m"
+          nodeDeletionTimeoutSeconds: 30
+          nodeVolumeDetachTimeoutSeconds: 300
           minReadySeconds: 5
           replicas: ${WORKER_MACHINE_COUNT}
           failureDomains:

test/e2e/data/infrastructure-docker/main/clusterclass-in-memory.yaml

@@ -105,52 +105,50 @@ metadata:
   name: in-memory
 spec:
   controlPlane:
-    metadata:
-      annotations:
     machineInfrastructure:
-      ref:
-        apiGroup: infrastructure.cluster.x-k8s.io
+      templateRef:
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
         kind: DevMachineTemplate
         name: in-memory-control-plane
-    ref:
-      apiGroup: controlplane.cluster.x-k8s.io
+    templateRef:
+      apiVersion: controlplane.cluster.x-k8s.io/v1beta2
       kind: KubeadmControlPlaneTemplate
       name: in-memory-control-plane
     machineHealthCheck:
       unhealthyConditions:
         - type: Ready
-          status: Unknown
-          timeout: 300s
+          status: "Unknown"
+          timeoutSeconds: 300
         - type: Ready
           status: "False"
-          timeout: 300s
+          timeoutSeconds: 300
   infrastructure:
-    ref:
-      apiGroup: infrastructure.cluster.x-k8s.io
+    templateRef:
+      apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
       kind: DevClusterTemplate
       name: in-memory-cluster
   workers:
     machineDeployments:
       - class: default-worker
         template:
           bootstrap:
-            ref:
-              apiGroup: bootstrap.cluster.x-k8s.io
+            templateRef:
+              apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
               kind: KubeadmConfigTemplate
               name: in-memory-default-worker-bootstraptemplate
           infrastructure:
-            ref:
-              apiGroup: infrastructure.cluster.x-k8s.io
+            templateRef:
+              apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
               kind: DevMachineTemplate
               name: in-memory-default-worker-machinetemplate
         machineHealthCheck:
           unhealthyConditions:
             - type: Ready
-              status: Unknown
-              timeout: 300s
+              status: "Unknown"
+              timeoutSeconds: 300
             - type: Ready
               status: "False"
-              timeout: 300s
+              timeoutSeconds: 300
   patches:
     - name: test-patch
       external:

test/e2e/data/infrastructure-docker/main/clusterclass-quick-start-runtimesdk.yaml

@@ -4,20 +4,20 @@ metadata:
   name: quick-start-runtimesdk
 spec:
   controlPlane:
-    ref:
-      apiGroup: controlplane.cluster.x-k8s.io
+    templateRef:
+      apiVersion: controlplane.cluster.x-k8s.io/v1beta2
       kind: KubeadmControlPlaneTemplate
       name: quick-start-control-plane
     machineInfrastructure:
-      ref:
+      templateRef:
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
         kind: DockerMachineTemplate
-        apiGroup: infrastructure.cluster.x-k8s.io
         name: quick-start-control-plane
     namingStrategy:
       template: "{{ .cluster.name }}-cp-{{ .random }}"
   infrastructure:
-    ref:
-      apiGroup: infrastructure.cluster.x-k8s.io
+    templateRef:
+      apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
       kind: DockerClusterTemplate
       name: quick-start-cluster
   infrastructureNamingStrategy:
@@ -29,13 +29,13 @@ spec:
         template: "{{ .cluster.name }}-md-{{ .machineDeployment.topologyName }}-{{ .random }}"
       template:
         bootstrap:
-          ref:
-            apiGroup: bootstrap.cluster.x-k8s.io
+          templateRef:
+            apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
             kind: KubeadmConfigTemplate
             name: quick-start-default-worker-bootstraptemplate
         infrastructure:
-          ref:
-            apiGroup: infrastructure.cluster.x-k8s.io
+          templateRef:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
             kind: DockerMachineTemplate
             name: quick-start-default-worker-machinetemplate
     machinePools:
@@ -44,13 +44,13 @@ spec:
         template: "{{ .cluster.name }}-mp-{{ .machinePool.topologyName }}-{{ .random }}"
       template:
         bootstrap:
-          ref:
-            apiGroup: bootstrap.cluster.x-k8s.io
+          templateRef:
+            apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
             kind: KubeadmConfigTemplate
             name: quick-start-default-worker-bootstraptemplate
         infrastructure:
-          ref:
-            apiGroup: infrastructure.cluster.x-k8s.io
+          templateRef:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
             kind: DockerMachinePoolTemplate
             name: quick-start-default-worker-machinepooltemplate
   patches:
@@ -93,7 +93,7 @@ spec:
   template:
     spec:
       machineTemplate:
-        nodeDrainTimeout: 1s
+        nodeDrainTimeoutSeconds: 1
       kubeadmConfigSpec:
         clusterConfiguration:
           apiServer:

test/e2e/data/infrastructure-docker/main/clusterclass-quick-start.yaml

@@ -9,24 +9,24 @@ spec:
         ClusterClass.controlPlane.label: "ClusterClass.controlPlane.labelValue"
       annotations:
         ClusterClass.controlPlane.annotation: "ClusterClass.controlPlane.annotationValue"
-    ref:
-      apiGroup: controlplane.cluster.x-k8s.io
+    templateRef:
+      apiVersion: controlplane.cluster.x-k8s.io/v1beta2
       kind: KubeadmControlPlaneTemplate
       name: quick-start-control-plane
     machineInfrastructure:
-      ref:
+      templateRef:
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
         kind: DockerMachineTemplate
-        apiGroup: infrastructure.cluster.x-k8s.io
         name: quick-start-control-plane
     machineHealthCheck:
       maxUnhealthy: 100%
       unhealthyConditions:
         - type: e2e.remediation.condition
           status: "False"
-          timeout: 20s
+          timeoutSeconds: 20
   infrastructure:
-    ref:
-      apiGroup: infrastructure.cluster.x-k8s.io
+    templateRef:
+      apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
       kind: DockerClusterTemplate
       name: quick-start-cluster
   workers:
@@ -39,13 +39,13 @@ spec:
           annotations:
             ClusterClass.machineDeployment.annotation: "ClusterClass.machineDeployment.annotationValue"
         bootstrap:
-          ref:
-            apiGroup: bootstrap.cluster.x-k8s.io
+          templateRef:
+            apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
             kind: KubeadmConfigTemplate
             name: quick-start-md-default-worker-bootstraptemplate
         infrastructure:
-          ref:
-            apiGroup: infrastructure.cluster.x-k8s.io
+          templateRef:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
             kind: DockerMachineTemplate
             name: quick-start-default-worker-machinetemplate
       machineHealthCheck:
@@ -60,13 +60,13 @@ spec:
           annotations:
             ClusterClass.machinePool.annotation: "ClusterClass.machinePool.annotationValue"
         bootstrap:
-          ref:
-            apiGroup: bootstrap.cluster.x-k8s.io
+          templateRef:
+            apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
             kind: KubeadmConfigTemplate
             name: quick-start-mp-default-worker-bootstraptemplate
         infrastructure:
-          ref:
-            apiGroup: infrastructure.cluster.x-k8s.io
+          templateRef:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
             kind: DockerMachinePoolTemplate
             name: quick-start-default-worker-machinepooltemplate
   variables:
@@ -541,7 +541,7 @@ spec:
             ControlPlaneTemplate.machineTemplate.label: "ControlPlaneTemplate.machineTemplate.labelValue"
           annotations:
             ControlPlaneTemplate.machineTemplate.annotation: "ControlPlaneTemplate.machineTemplate.annotationValue"
-        nodeDrainTimeout: 1s
+        nodeDrainTimeoutSeconds: 1
       kubeadmConfigSpec:
         clusterConfiguration:
           # extraArgs must be non-empty for control plane components to enable patches from ClusterClass to work.