Merge pull request #244 from openinfradev/capa_fix_ami

cluster-api-aws: fix AMI specification errors

Author: ktkfree

cluster-api-aws/templates/kubeadm-control-plane.yaml

@@ -55,7 +55,7 @@ spec:
       rootVolume:
         size: {{ .Values.kubeadmControlPlane.rootVolume.size }}
         type: {{ .Values.kubeadmControlPlane.rootVolume.type }}
-      {{- if .Values.kubeadmControlPlane.ami }}
+      {{- with .Values.kubeadmControlPlane.ami }}
       ami:
         {{- toYaml . | nindent 8 }}
       {{- end }}

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

@@ -83,6 +83,11 @@ spec:
       additionalSecurityGroups:
         {{- toYaml . | nindent 10 }}
       {{- end }}
+      {{- with .ami }}
+      ami:
+        {{- toYaml . | nindent 10 }}
+      {{- end }}
+
 
 ---
 {{- if $envAll.Values.cluster.eksEnabled }}

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

@@ -74,7 +74,7 @@ spec:
     rootVolume:
       size: {{ .rootVolume.size }}
       type: {{ .rootVolume.type }}
-    {{- if .ami }}
+    {{- with .ami }}
     ami:
       {{- toYaml . | nindent 8 }}
     {{- end }}

cluster-api-aws/values.yaml

@@ -61,7 +61,7 @@ kubeadmControlPlane:
     size: 8
     type: gp3
   # ami:
-  #   id: ami-xxxxxxxxxxxxxxxxx
+  #   id: ami-02e4e8f09921cfe97
   # additionalSecurityGroups: []
   useSpotInstance: #spotMarketOptions:
     enabled: false
@@ -93,6 +93,7 @@ machinePool: []
 #   roleAdditionalPolicies:
 #   - "arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy"
 #   additionalSecurityGroups: []
+#   ami: ami-02e4e8f09921cfe97
 # **this version dosen't support the spot instance, because the aws cluster api provider doesn't support it in awsmachinpool**
 # useSpotInstance:  #spotMarketOptions:
 #   enabled: false
@@ -108,6 +109,7 @@ machinePool: []
 #   subnets: []
 #   labels: []
 #   additionalSecurityGroups: []
+#   ami: ami-02e4e8f09921cfe97
 
 machineDeployment: []
 # You can define machineDeployment to use cluster-autoscaler on aws. Refer to below.
@@ -126,6 +128,7 @@ machineDeployment: []
 #     maxPrice: ''
 #     # MaxPrice defines the maximum price the user is willing to pay for Spot VM instances
 #   additionalSecurityGroups: []
+#   ami: ami-02e4e8f09921cfe97
 
 machineKubeadmConfig:
   kubeletExtraArgs: {}