Add support for kubeadmConfigTemplate default value

Author: chrodriguez

charts/capi-proxmox/Chart.yaml

@@ -8,7 +8,7 @@ keywords:
 - bootstrapping
 - kubernetes
 - proxmox
-version: 1.0.0
+version: 1.0.1
 appVersion: v1beta1
 home: https://github.com/ionos-cloud/cluster-api-provider-proxmox
 sources:

charts/capi-proxmox/templates/_helpers.tpl

@@ -99,3 +99,7 @@ range iteration
 {{- printf "%s-%s" (include "capi-proxmox.name" .Context) $templateName |
       trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{- define "capi-proxmox.kubeadmConfigTemplateJoinConfig" -}}
+{{- merge .Context.Values.kubeadmConfigTemplateDefaults .KubeadmConfigTemplate | toYaml }}
+{{- end -}}

charts/capi-proxmox/templates/kubeadm-config-template.yaml

@@ -14,9 +14,9 @@ spec:
       users:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with (required (printf 
-          ".Values.kubeadmConfigTemplates[%d].joinConfiguration" $index )
-              $template.joinConfiguration) }}
+      {{- with
+          (include "capi-proxmox.kubeadmConfigTemplateJoinConfig" $object |
+            fromYaml) }}
       joinConfiguration:
         {{- toYaml . | nindent 8 }}
       {{- end }}

charts/capi-proxmox/values-test.yaml

@@ -26,6 +26,12 @@ kubeadmControlPlane:
     - name: juan
       sshAuthorizedKeys: 
         - juan
+  initConfiguration:
+    nodeRegistration:
+      taints: []
+  joinConfiguration:
+    nodeRegistration:
+      taints: []
 
 machineTemplates:
   - name: control-plane
@@ -62,5 +68,7 @@ kubeadmConfigTemplates:
   - name: worker
     joinConfiguration:
       nodeRegistration:
-        kubeletExtraArgs:
-          provider-id: "proxmox://'{{ ds.meta_data.instance_id }}'"
+        taints:
+        - key: role
+          value: storage
+          effect: NoSchedule

charts/capi-proxmox/values.yaml

@@ -199,15 +199,24 @@ kubeadmControlPlane:
   preKubeadmCommands:
     - /etc/kube-vip-prepare.sh
 
+# This value will be merged with each kubeadmConfigTemplate
+kubeadmConfigTemplateDefaults:
+  joinConfiguration:
+    nodeRegistration:
+      kubeletExtraArgs:
+        provider-id: "proxmox://'{{ ds.meta_data.instance_id }}'"
+
 # KubeadmConfigTemplates to create machines. 
 #   kubectl explain KubeadmConfigTemplate.spec.kubeadmConfigSpec
 #
 kubeadmConfigTemplates: []
   #  - name: worker
   #    joinConfiguration:
   #      nodeRegistration:
-  #        kubeletExtraArgs:
-  #          provider-id: "proxmox://'{{ ds.meta_data.instance_id }}'"
+  #        taints:
+  #          - key: role
+  #            value: storage
+  #            effect: NoSchedule
   #     users: []