fix unknown fields

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

Author: sivchari

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

@@ -23,7 +23,6 @@ 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/v1beta2

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

@@ -44,4 +44,3 @@ 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-ipv6/kcp-ipv6.yaml

@@ -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-kcp-adoption/step1/cluster-with-cp0.yaml

@@ -42,10 +42,6 @@ spec:
   clusterConfiguration:
     apiServer:
       certSANs: [localhost, 127.0.0.1]
-  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.
 ---
 # cp0 Machine
 apiVersion: cluster.x-k8s.io/v1beta2

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

@@ -57,10 +57,6 @@ spec:
       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.
     files:
     - path: /wait-signal.sh
       content: |

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

@@ -1,8 +1,8 @@
 ---
 # MachineHealthCheck object with
 # - a selector that targets all the machines with label cluster.x-k8s.io/control-plane="" and the mhc-test: "fail" (the label is used to trigger remediation in a controlled way - by adding CP under MHC control intentionally -)
-# - nodeStartupTimeout: 30s (to force remediation on nodes still provisioning)
-# - unhealthyConditions triggering remediation after 10s the e2e.remediation.condition condition is set to false (to force remediation on nodes already provisioned)
+# - nodeStartupTimeoutSeconds: 30s (to force remediation on nodes still provisioning)
+# - unhealthyNodeConditions triggering remediation after 10s the e2e.remediation.condition condition is set to false (to force remediation on nodes already provisioned)
 apiVersion: cluster.x-k8s.io/v1beta2
 kind: MachineHealthCheck
 metadata:
@@ -15,7 +15,7 @@ spec:
       cluster.x-k8s.io/control-plane: ""
       mhc-test: "fail"
   nodeStartupTimeoutSeconds: 30
-  unhealthyConditions:
+  unhealthyNodeConditions:
     - type: e2e.remediation.condition
       status: "False"
       timeoutSeconds: 10

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

@@ -1,7 +1,7 @@
 ---
 # MachineHealthCheck object with
 # - a selector that targets all the machines with label e2e.remediation.label=""
-# - unhealthyConditions triggering remediation after 10s the condition is set
+# - unhealthyNodeConditions triggering remediation after 10s the condition is set
 apiVersion: cluster.x-k8s.io/v1beta2
 kind: MachineHealthCheck
 metadata:
@@ -12,7 +12,7 @@ spec:
   selector:
     matchLabels:
       e2e.remediation.label: ""
-  unhealthyConditions:
+  unhealthyNodeConditions:
     - type: e2e.remediation.condition
       status: "False"
       timeoutSeconds: 10

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

@@ -27,12 +27,14 @@ spec:
           nodeRegistration:
             criSocket: unix:///var/run/containerd/containerd.sock
             kubeletExtraArgs:
-              eviction-hard: 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:
-              eviction-hard: 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
@@ -97,7 +99,8 @@ spec:
         nodeRegistration:
           criSocket: unix:///var/run/containerd/containerd.sock
           kubeletExtraArgs:
-            eviction-hard: 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
@@ -152,5 +155,5 @@ spec:
   patches:
     - name: test-patch
       external:
-        generateExtension: generate-patches.${EXTENSION_CONFIG_NAME:-"scale"}
+        generatePatchesExtension: generate-patches.${EXTENSION_CONFIG_NAME:-"scale"}
         discoverVariablesExtension: discover-variables.${EXTENSION_CONFIG_NAME:-"scale"}

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

@@ -56,8 +56,8 @@ spec:
   patches:
   - name: test-patch
     external:
-      generateExtension: generate-patches.${EXTENSION_CONFIG_NAME:-"k8s-upgrade-with-runtimesdk"}
-      validateExtension: validate-topology.${EXTENSION_CONFIG_NAME:-"k8s-upgrade-with-runtimesdk"}
+      generatePatchesExtension: generate-patches.${EXTENSION_CONFIG_NAME:-"k8s-upgrade-with-runtimesdk"}
+      validateTopologyExtension: validate-topology.${EXTENSION_CONFIG_NAME:-"k8s-upgrade-with-runtimesdk"}
       discoverVariablesExtension: discover-variables.${EXTENSION_CONFIG_NAME:-"k8s-upgrade-with-runtimesdk"}
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
@@ -145,4 +145,3 @@ spec:
   template:
     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/clusterclass-quick-start.yaml

@@ -20,7 +20,7 @@ spec:
         name: quick-start-control-plane
     machineHealthCheck:
       maxUnhealthy: 100%
-      unhealthyConditions:
+      unhealthyNodeConditions:
         - type: e2e.remediation.condition
           status: "False"
           timeoutSeconds: 20
@@ -50,7 +50,7 @@ spec:
             name: quick-start-default-worker-machinetemplate
       machineHealthCheck:
         maxUnhealthy: 100%
-        # We are intentionally not setting the 'unhealthyConditions' here to test that the field is optional.
+        # We are intentionally not setting the 'unhealthyNodeConditions' here to test that the field is optional.
     machinePools:
     - class: default-worker
       template:
@@ -324,11 +324,15 @@ spec:
             controlPlane: true
         jsonPatches:
           - op: add
-            path: "/spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cloud-provider"
-            value: "external"
+            path: "/spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs"
+            value:
+              name: "cloud-provider"
+              value: "external"
           - op: add
-            path: "/spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs/cloud-provider"
-            value: "external"
+            path: "/spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs"
+            value:
+              name: "cloud-provider"
+              value: "external"
   - name: machineDeploymentExternalCloudProvider
     enabledIf: "{{ .externalCloudProvider }}"
     description: "Configures kubelet to run with an external cloud provider for machineDeployment nodes."
@@ -342,8 +346,10 @@ spec:
                 - '*-worker'
         jsonPatches:
           - op: add
-            path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cloud-provider"
-            value: "external"
+            path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs"
+            value:
+              name: "cloud-provider"
+              value: "external"
       - selector:
           apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
           kind: KubeadmConfigTemplate
@@ -353,8 +359,10 @@ spec:
                 - '*-worker'
         jsonPatches:
           - op: add
-            path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cloud-provider"
-            value: "external"
+            path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs"
+            value:
+              name: "cloud-provider"
+              value: "external"
   - name: localEndpointIPv6
     enabledIf: "{{ .ipv6Primary }}"
     description: "Configures KCP to use IPv6 for its localAPIEndpoint."
@@ -447,13 +455,17 @@ spec:
             controlPlane: true
         jsonPatches:
           - op: add
-            path: "/spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs/v"
-            valueFrom:
-              variable: kubeletLogLevel
+            path: "/spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs"
+            value:
+              name: v
+              valueFrom:
+                value: kubeletLogLevel
           - op: add
-            path: "/spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs/v"
-            valueFrom:
-              variable: kubeletLogLevel
+            path: "/spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs"
+            value:
+              name: v
+              valueFrom:
+                value: kubeletLogLevel
   - name: workerKubeletLogLevel
     enabledIf: "{{ if .kubeletLogLevel }}true{{end}}"
     description: "Configures worker kubelets to log at the level set in the variable `kubeletLogLevel`."
@@ -559,11 +571,13 @@ spec:
         initConfiguration:
           nodeRegistration: # node registration parameters are automatically injected by CAPD according to the kindest/node image in use.
             kubeletExtraArgs: # having a not empty kubeletExtraArgs is required for the externalCloudProvider patch to work
-              eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+              name: eviction-hard
+              value: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
         joinConfiguration:
           nodeRegistration: # node registration parameters are automatically injected by CAPD according to the kindest/node image in use.
             kubeletExtraArgs: # having a not empty kubeletExtraArgs is required for the externalCloudProvider patch to work
-              eviction-hard: '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: DockerMachineTemplate
@@ -648,7 +662,8 @@ spec:
       joinConfiguration:
         nodeRegistration: # node registration parameters are automatically injected by CAPD according to the kindest/node image in use.
           kubeletExtraArgs: # having a not empty kubeletExtraArgs is required for the externalCloudProvider to work
-            eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+            name: eviction-hard
+            value: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
 kind: KubeadmConfigTemplate
@@ -669,4 +684,5 @@ spec:
       joinConfiguration:
         nodeRegistration: # node registration parameters are automatically injected by CAPD according to the kindest/node image in use.
           kubeletExtraArgs: # having a not empty kubeletExtraArgs is required for the externalCloudProvider to work
-            eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+            name: eviction-hard
+            value: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'