Merge pull request #241 from openinfradev/override-kubelet-args

add value 'kubeletExtraArgs' to cluster-api-aws

Author: ktkfree

cluster-api-aws/Chart.yaml

@@ -4,6 +4,6 @@ description: A chart to install Kubernetes cluster using Cluster API Provider AW
 
 type: application
 
-version: 0.11.1
+version: 0.11.2
 
 appVersion: "2.2.1"

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

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

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

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

cluster-api-aws/values.yaml

@@ -80,7 +80,7 @@ kubeadmControlPlane:
           listen-metrics-urls: "http://0.0.0.0:2381"
 
 machinePool: []
-# You can define machinePool. referce the belows.
+# You can define machinePool. Refer to below.
 # - name: taco
 #   machineType: t3.2xlarge
 #   replicas: 3
@@ -110,7 +110,7 @@ machinePool: []
 #   additionalSecurityGroups: []
 
 machineDeployment: []
-# You can define machineDeployment to use cluster-autoscaler on aws. referce the belows.
+# You can define machineDeployment to use cluster-autoscaler on aws. Refer to below.
 # - name: normal
 #   numberOfAZ: 3
 #   minSizePerAZ: 1
@@ -129,3 +129,10 @@ machineDeployment: []
 
 nameOverride: ""
 fullnameOverride: ""
+
+# Extra args for kubelet except 'cloud-provider'. Refer to the example below.
+# kubeletExtraArgs:
+#   feature-gates: "InPlacePodVerticalScaling=true"
+#   max-pods: "110"
+kubeadmConfig:
+  kubeletExtraArgs: {}