Merge "Make userData optional in cluster chart"

diff --git a/deploy/cluster/templates/kubeadmconfigtemplate.yaml b/deploy/cluster/templates/kubeadmconfigtemplate.yaml
index 0172dc7..33afc28 100644 (file)
--- a/deploy/cluster/templates/kubeadmconfigtemplate.yaml
+++ b/deploy/cluster/templates/kubeadmconfigtemplate.yaml
@@ -47,6 +47,7 @@ spec:
         permissions: '0777'
         content: |
 {{ $.Files.Get "resources/set_kernel_cmdline.sh" | indent 10 }}
+{{- if .Values.userData }}
       users:
       - name: {{ .Values.userData.name }}
         shell: /bin/bash
@@ -59,3 +60,4 @@ spec:
       - name: root
         sshAuthorizedKeys:
         - {{ .Values.userData.sshAuthorizedKey }}
+{{- end }}

diff --git a/deploy/cluster/templates/kubeadmcontrolplane.yaml b/deploy/cluster/templates/kubeadmcontrolplane.yaml
index 3342c73..c960733 100644 (file)
--- a/deploy/cluster/templates/kubeadmcontrolplane.yaml
+++ b/deploy/cluster/templates/kubeadmcontrolplane.yaml
@@ -82,6 +82,7 @@ spec:
       permissions: '0777'
       content: |
 {{ $.Files.Get "resources/set_kernel_cmdline.sh" | indent 8 }}
+{{- if .Values.userData }}
     users:
     - name: {{ .Values.userData.name }}
       shell: /bin/bash
@@ -94,6 +95,7 @@ spec:
     - name: root
       sshAuthorizedKeys:
       - {{ .Values.userData.sshAuthorizedKey }}
+{{- end }}
   machineTemplate:
     infrastructureRef:
       apiVersion: infrastructure.cluster.x-k8s.io/v1alpha5