Merge pull request #243 from openinfradev/capa_fix_mp_kubeadmconfig

cluster-api-aws: fix kubelet args for machinePool/Deployment

Author: ktkfree

cluster-api-aws/templates/machine-deployment.yaml

@@ -104,11 +104,11 @@ spec:
     spec:
       joinConfiguration:
         nodeRegistration:
-          {{- with $envAll.Values.kubeadmConfig.kubeletExtraArgs }}
           kubeletExtraArgs:
             cloud-provider: external
-            {{ toYaml . }}
+            {{- with $envAll.Values.machineKubeadmConfig.kubeletExtraArgs }}
+            {{- toYaml . | nindent 12}}
+            {{- end }}
           name: '{{`{{ ds.meta_data.local_hostname }}`}}'
-          {{- end }}
 {{- end }}
 {{- end }}

cluster-api-aws/templates/machine-pool.yaml

@@ -101,11 +101,11 @@ metadata:
 spec:
   joinConfiguration:
     nodeRegistration:
-      {{- with $envAll.Values.kubeadmConfig.kubeletExtraArgs }}
       kubeletExtraArgs:
         cloud-provider: external
-        {{ toYaml . }}
+        {{- with $envAll.Values.machineKubeadmConfig.kubeletExtraArgs }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       name: '{{`{{ ds.meta_data.local_hostname }}`}}'
-      {{- end }}
 {{- end }}
 {{- end }}

cluster-api-aws/values.yaml

@@ -127,16 +127,16 @@ machineDeployment: []
 #     # MaxPrice defines the maximum price the user is willing to pay for Spot VM instances
 #   additionalSecurityGroups: []
 
+machineKubeadmConfig:
+  kubeletExtraArgs: {}
+# Extra args for machinePool/Deployment nodes's kubelet except 'cloud-provider'. Refer to the example below.
+# kubeletExtraArgs:
+#   feature-gates: "InPlacePodVerticalScaling=true"
+#   max-pods: "110"
+
 awsCloudControllerManager:
   image:
     repository: registry.k8s.io/provider-aws/cloud-controller-manager
     tag: v1.28.3
 nameOverride: ""
 fullnameOverride: ""
-
-# Extra args for kubelet except 'cloud-provider'. Refer to the example below.
-# kubeletExtraArgs:
-#   feature-gates: "InPlacePodVerticalScaling=true"
-#   max-pods: "110"
-kubeadmConfig:
-  kubeletExtraArgs: {}