Merge pull request 'Fixing KubeadmConfigTemplate not rendering' (#488…

…) from fix/kubeadm-config-template-not-renderring into master
Obmondo · Nov 13, 2024 · 1f52b98 · 1f52b98
2 parents 39e5082 + 485280a
commit 1f52b98
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/argocd-helm-charts/capi-cluster/charts/aws/templates/KubeadmConfigTemplate.yaml b/argocd-helm-charts/capi-cluster/charts/aws/templates/KubeadmConfigTemplate.yaml
@@ -1,4 +1,4 @@
-{{- if (.Values.global.capa).enableClusterAutoscaler }}
+{{- if (.Values.global).enableClusterAutoscaler }}
 {{- range $index, $nodeGroup := $.Values.nodeGroups }}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
@@ -14,7 +14,7 @@ spec:
             cloud-provider: external
           name: '{{"{{"}} ds.meta_data.local_hostname {{"}}"}}'
           {{- if $nodeGroup.taints }}
-          taints: {{- toYaml $nodeGroup.taints | nindent 12 }}
+          taints: {{- toYaml $nodeGroup.taints | nindent 10 }}
           {{- end }}
 {{- end }}
 {{- end }}
diff --git a/argocd-helm-charts/capi-cluster/examples/aws/cluster-autoscaler.yaml b/argocd-helm-charts/capi-cluster/examples/aws/cluster-autoscaler.yaml
@@ -38,3 +38,19 @@ aws:
         node.cluster.x-k8s.io/nodegroup: primary
         node-role.kubernetes.io/bootstrapper: ""
       taints: []
+    - name: secondary
+      # minSize: 1
+      # maxSize: 3
+      # replicas: 2
+      instanceType: t4g.medium
+      sshKeyName: kubeaid-demo
+      ami:
+        id: ami-0fc044fa0d061d18d
+      rootVolumeSize: 35
+      labels:
+        node.cluster.x-k8s.io/nodegroup: secondary
+      taints:
+        - key: dedicated
+          value: guilherme-taint
+          effect: NoSchedule
+          timeadded: null