fix kubelet extra args and naming strategy

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

Author: sivchari

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

@@ -10,19 +10,27 @@ 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/v1beta2
 kind: KubeadmConfigTemplate
@@ -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-ipv6/kcp-ipv6.yaml

@@ -15,10 +15,10 @@ spec:
         bindPort: 6443
       nodeRegistration:
         kubeletExtraArgs:
-          name: node-ip
-          value: "::"
+          - name: node-ip
+            value: "::"
     joinConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
-          name: node-ip
-          value: "::"
+          - name: node-ip
+            value: "::"

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

@@ -9,8 +9,10 @@ spec:
       initConfiguration:
         nodeRegistration:
           kubeletExtraArgs:
-            node-ip: "::"
+            - name: node-ip
+              value: "::"
       joinConfiguration:
         nodeRegistration:
           kubeletExtraArgs:
-            node-ip: "::"
+            - name: node-ip
+              value: "::"

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

@@ -27,14 +27,14 @@ spec:
           nodeRegistration:
             criSocket: unix:///var/run/containerd/containerd.sock
             kubeletExtraArgs:
-              name: eviction-hard
-              value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
+              - name: eviction-hard
+                value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
         joinConfiguration:
           nodeRegistration:
             criSocket: unix:///var/run/containerd/containerd.sock
             kubeletExtraArgs:
-              name: eviction-hard
-              value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
+              - name: eviction-hard
+                value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: DevMachineTemplate
@@ -99,8 +99,8 @@ spec:
         nodeRegistration:
           criSocket: unix:///var/run/containerd/containerd.sock
           kubeletExtraArgs:
-            name: eviction-hard
-            value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
+            - name: eviction-hard
+              value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
 ---
 apiVersion: cluster.x-k8s.io/v1beta2
 kind: ClusterClass

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

@@ -20,7 +20,7 @@ spec:
       apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
       kind: DockerClusterTemplate
       name: quick-start-cluster
-  infrastructureNamingStrategy:
+    namingStrategy:
       template: "{{ .cluster.name }}-infra-{{ .random }}"
   workers:
     machineDeployments:

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

@@ -78,12 +78,6 @@ spec:
         default: kindest
   - name: etcdImageTag
     required: true
-    # This metadata has just been added to verify that we can set metadata.
-    metadata:
-      labels:
-        testLabelKey: testLabelValue
-      annotations:
-        testAnnotationKey: testAnnotationValue
     schema:
       openAPIV3Schema:
         type: string