update the committers for icn

[icn.git] / deploy / cluster / templates / kubeadmconfigtemplate.yaml

diff --git a/deploy/cluster/templates/kubeadmconfigtemplate.yaml b/deploy/cluster/templates/kubeadmconfigtemplate.yaml
index 33afc28..d9e2488 100644 (file)
--- a/deploy/cluster/templates/kubeadmconfigtemplate.yaml
+++ b/deploy/cluster/templates/kubeadmconfigtemplate.yaml
@@ -9,16 +9,15 @@ spec:
       joinConfiguration:
         nodeRegistration:
           kubeletExtraArgs:
+            {{- include "cluster.nodeIP" .Values.networkData | nindent 12 }}
             node-labels: metal3.io/uuid={{ "{{" }} ds.meta_data.uuid {{ "}}" }}
             cpu-manager-policy: static
             topology-manager-policy: best-effort
             kube-reserved: cpu=100m,memory=256Mi
           name: '{{ "{{" }} ds.meta_data.name {{ "}}" }}'
       preKubeadmCommands:
-{{- if .Values.networks }}
-      # Without touching up /etc/hosts, kubeadm may pick the wrong
-      # (i.e. provisioning network) address for the node IP
-      - sed -i "1i $(ip -4 addr show dev {{ .Values.networks.baremetal.interface }} | grep -oP '(?<=inet\s)\d+(\.\d+){3}' | head -1) $(hostname)" /etc/hosts
+{{- if .Values.preKubeadmCommands }}
+{{ toYaml .Values.preKubeadmCommands | indent 6 }}
 {{- end }}
       - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
       - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
@@ -34,6 +33,8 @@ spec:
       # This must be done after kubeadm as the cabpk provider relies
       # on files in /var/run, which won't persist after a reboot
       - /usr/local/bin/set_kernel_cmdline.sh
+      # Required for OpenEBS support
+      - /usr/local/bin/enable_iscsi.sh
       files:
 {{ include "cluster.containerRuntime" .Values | indent 6 }}
       - path: /etc/systemd/system/containerd.service.d/override.conf
@@ -47,6 +48,15 @@ spec:
         permissions: '0777'
         content: |
 {{ $.Files.Get "resources/set_kernel_cmdline.sh" | indent 10 }}
+      - path: /usr/local/bin/enable_iscsi.sh
+        permissions: '0777'
+        content: |
+{{ $.Files.Get "resources/enable_iscsi.sh" | indent 10 }}
+{{- if eq .Values.cni "calico" }}
+      - path: /etc/NetworkManager/conf.d/calico.conf
+        content: |
+{{ $.Files.Get "resources/calico.conf" | indent 10 }}
+{{- end }}
 {{- if .Values.userData }}
       users:
       - name: {{ .Values.userData.name }}