[WIP] [DON'T MERGE] ⚠️ Tests for Migrate E2E tests to v1beta2

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

@@ -1,32 +1,32 @@
 ---
 # DockerCluster object referenced by the Cluster object
-apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: DockerCluster
 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
 # - Reference to the KubeadmControlPlane object
 # - the label cni=${CLUSTER_NAME}-crs-0, so the cluster can be selected by the ClusterResourceSet.
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: Cluster
 metadata:
   name: '${CLUSTER_NAME}'
@@ -40,16 +40,16 @@ spec:
       cidrBlocks: ['${DOCKER_POD_CIDRS}']
     serviceDomain: '${DOCKER_SERVICE_DOMAIN}'
   infrastructureRef:
-    apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+    apiGroup: infrastructure.cluster.x-k8s.io
     kind: DockerCluster
     name: '${CLUSTER_NAME}'
   controlPlaneRef:
     kind: KubeadmControlPlane
-    apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+    apiGroup: controlplane.cluster.x-k8s.io
     name: "${CLUSTER_NAME}-control-plane"
 ---
 # DockerMachineTemplate object referenced by the KubeadmControlPlane object
-apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: DockerMachineTemplate
 metadata:
   name: "${CLUSTER_NAME}-control-plane"
@@ -65,7 +65,7 @@ spec:
 # KubeadmControlPlane referenced by the Cluster object with
 # - the label kcp-adoption.step2, because it should be created in the second step of the kcp-adoption test.
 kind: KubeadmControlPlane
-apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+apiVersion: controlplane.cluster.x-k8s.io/v1beta2
 metadata:
   name: "${CLUSTER_NAME}-control-plane"
   labels:
@@ -75,15 +75,11 @@ spec:
   machineTemplate:
     infrastructureRef:
       kind: DockerMachineTemplate
-      apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+      apiGroup: infrastructure.cluster.x-k8s.io
       name: "${CLUSTER_NAME}-control-plane"
   kubeadmConfigSpec:
     clusterConfiguration:
       apiServer:
         # host.docker.internal is required by kubetest when running on MacOS because of the way ports are proxied.
         certSANs: [localhost, 127.0.0.1, 0.0.0.0, host.docker.internal]
-    initConfiguration:
-      nodeRegistration: {} # node registration parameters are automatically injected by CAPD according to the kindest/node image in use.
-    joinConfiguration:
-      nodeRegistration: {} # node registration parameters are automatically injected by CAPD according to the kindest/node image in use.
   version: "${KUBERNETES_VERSION}"

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

@@ -1,4 +1,4 @@
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: Cluster
 metadata:
   name: '${CLUSTER_NAME}'
@@ -13,8 +13,9 @@ spec:
       cidrBlocks: ['${DOCKER_POD_CIDRS}']
     serviceDomain: '${DOCKER_SERVICE_DOMAIN}'
   topology:
-    class: "quick-start"
-    classNamespace: '${CLUSTER_CLASS_NAMESPACE:-""}'
+    classRef:
+      name: "quick-start"
+      namespace: '${CLUSTER_CLASS_NAMESPACE:-${NAMESPACE}}'
     version: "${KUBERNETES_VERSION}"
     controlPlane:
       metadata:
@@ -26,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:
@@ -42,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
@@ -62,12 +63,12 @@ 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:
-        - fd4
+          - fd4
     variables:
       # We set an empty value to use the default tag kubeadm init is using.
     - name: etcdImageTag

test/e2e/data/infrastructure-docker/main/bases/crs.yaml

@@ -10,7 +10,7 @@ binaryData:
 ---
 # ClusterResourceSet object with
 # a selector that targets all the Cluster with label cni=${CLUSTER_NAME}-crs-0
-apiVersion: addons.cluster.x-k8s.io/v1beta1
+apiVersion: addons.cluster.x-k8s.io/v1beta2
 kind: ClusterResourceSet
 metadata:
   name:  "${CLUSTER_NAME}-crs-0"

test/e2e/data/infrastructure-docker/main/bases/md.yaml

@@ -1,7 +1,7 @@
 ---
 # DockerMachineTemplate referenced by the MachineDeployment and with
 # - extraMounts for the docker sock, thus allowing self-hosting test
-apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: DockerMachineTemplate
 metadata:
   name: "${CLUSTER_NAME}-md-0"
@@ -15,18 +15,17 @@ spec:
       preLoadImages: ${DOCKER_PRELOAD_IMAGES:-[]}
 ---
 # KubeadmConfigTemplate referenced by the MachineDeployment
-apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
 kind: KubeadmConfigTemplate
 metadata:
   name: "${CLUSTER_NAME}-md-0"
 spec:
   template:
     spec:
       joinConfiguration:
-        nodeRegistration: {} # node registration parameters are automatically injected by CAPD according to the kindest/node image in use.
 ---
 # MachineDeployment object
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: MachineDeployment
 metadata:
   name: "${CLUSTER_NAME}-md-0"
@@ -42,10 +41,10 @@ spec:
       bootstrap:
         configRef:
           name: "${CLUSTER_NAME}-md-0"
-          apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+          apiGroup: bootstrap.cluster.x-k8s.io
           kind: KubeadmConfigTemplate
       infrastructureRef:
         name: "${CLUSTER_NAME}-md-0"
-        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+        apiGroup: infrastructure.cluster.x-k8s.io
         kind: DockerMachineTemplate
       failureDomain: fd4

test/e2e/data/infrastructure-docker/main/bases/mp.yaml

@@ -1,6 +1,6 @@
 ---
 # MachinePool which references the DockerMachinePool and KubeadmConfigTemplate below
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: MachinePool
 metadata:
   name: "${CLUSTER_NAME}-mp-0"
@@ -11,12 +11,12 @@ spec:
     spec:
       bootstrap:
         configRef:
-          apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+          apiGroup: bootstrap.cluster.x-k8s.io
           kind: KubeadmConfig
           name: "${CLUSTER_NAME}-mp-0-config"
       clusterName: '${CLUSTER_NAME}'
       infrastructureRef:
-        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+        apiGroup: infrastructure.cluster.x-k8s.io
         kind: DockerMachinePool
         name: "${CLUSTER_NAME}-dmp-0"
       version: "${KUBERNETES_VERSION}"
@@ -28,7 +28,7 @@ spec:
     - fd8
 ---
 # DockerMachinePool using default values referenced by the MachinePool
-apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: DockerMachinePool
 metadata:
   name: "${CLUSTER_NAME}-dmp-0"
@@ -38,10 +38,9 @@ spec:
       preLoadImages: ${DOCKER_PRELOAD_IMAGES:-[]}
 ---
 # KubeadmConfigTemplate referenced by the MachinePool
-apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
 kind: KubeadmConfig
 metadata:
   name: "${CLUSTER_NAME}-mp-0-config"
 spec:
   joinConfiguration:
-    nodeRegistration: {} # node registration parameters are automatically injected by CAPD according to the kindest/node image in use.

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

@@ -1,5 +1,5 @@
 kind: KubeadmControlPlane
-apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+apiVersion: controlplane.cluster.x-k8s.io/v1beta2
 metadata:
   name: "${CLUSTER_NAME}-control-plane"
 spec:
@@ -10,21 +10,29 @@ spec:
         # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
         criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
-          eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
-          fail-swap-on: "false"
-          cgroup-root: "/kubelet"
-          runtime-cgroups: "/system.slice/containerd.service"
+          - name: eviction-hard
+            value: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+          - name: fail-swap-on
+            value: "false"
+          - name: cgroup-root
+            value: "/kubelet"
+          - name: runtime-cgroups
+            value: "/system.slice/containerd.service"
     joinConfiguration:
       nodeRegistration:
         # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
         criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
-          eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
-          fail-swap-on: "false"
-          cgroup-root: "/kubelet"
-          runtime-cgroups: "/system.slice/containerd.service"
+          - name: eviction-hard
+            value: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+          - name: fail-swap-on
+            value: "false"
+          - name: cgroup-root
+            value: "/kubelet"
+          - name: runtime-cgroups
+            value: "/system.slice/containerd.service"
 ---
-apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
 kind: KubeadmConfigTemplate
 metadata:
   name: "${CLUSTER_NAME}-md-0"
@@ -47,7 +55,11 @@ spec:
           # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
           criSocket: unix:///var/run/containerd/containerd.sock
           kubeletExtraArgs:
-            eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
-            fail-swap-on: "false"
-            cgroup-root: "/kubelet"
-            runtime-cgroups: "/system.slice/containerd.service"
+            - name: eviction-hard
+              value: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+            - name: fail-swap-on
+              value: "false"
+            - name: cgroup-root
+              value: "/kubelet"
+            - name: runtime-cgroups
+              value: "/system.slice/containerd.service"

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

@@ -1,4 +1,4 @@
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: Cluster
 metadata:
   name: "${CLUSTER_NAME}"
@@ -11,8 +11,9 @@ spec:
       cidrBlocks: ${POD_CIDR:=["192.168.0.0/16"]}
     serviceDomain: ${SERVICE_DOMAIN:="cluster.local"}
   topology:
-    class: in-memory
-    classNamespace: ${NAMESPACE}
+    classRef:
+      name: in-memory
+      namespace: ${NAMESPACE}
     version: ${KUBERNETES_VERSION}
     controlPlane:
       replicas: ${CONTROL_PLANE_MACHINE_COUNT}

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

@@ -1,5 +1,5 @@
 ---
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: Cluster
 metadata:
   name: '${CLUSTER_NAME}'
@@ -10,7 +10,7 @@ spec:
     pods:
       cidrBlocks: ['${DOCKER_POD_IPV6_CIDRS}']
 ---
-apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: DockerCluster
 metadata:
   name: '${CLUSTER_NAME}'

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

@@ -1,6 +1,6 @@
 ---
 kind: KubeadmControlPlane
-apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+apiVersion: controlplane.cluster.x-k8s.io/v1beta2
 metadata:
   name: "${CLUSTER_NAME}-control-plane"
 spec:
@@ -15,8 +15,10 @@ spec:
         bindPort: 6443
       nodeRegistration:
         kubeletExtraArgs:
-          node-ip: "::"
+          - name: node-ip
+            value: "::"
     joinConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
-          node-ip: "::"
+          - name: node-ip
+            value: "::"

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

@@ -1,5 +1,5 @@
 ---
-apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
 kind: KubeadmConfigTemplate
 metadata:
   name: "${CLUSTER_NAME}-md-0"
@@ -9,8 +9,10 @@ spec:
       initConfiguration:
         nodeRegistration:
           kubeletExtraArgs:
-            node-ip: "::"
+            - name: node-ip
+              value: "::"
       joinConfiguration:
         nodeRegistration:
           kubeletExtraArgs:
-            node-ip: "::"
+            - name: node-ip
+              value: "::"