update the committers for icn

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

diff --git a/deploy/cluster/templates/kubeadmcontrolplane.yaml b/deploy/cluster/templates/kubeadmcontrolplane.yaml
index 08fce07..f49f7a1 100644 (file)
--- a/deploy/cluster/templates/kubeadmcontrolplane.yaml
+++ b/deploy/cluster/templates/kubeadmcontrolplane.yaml
@@ -12,6 +12,7 @@ spec:
     initConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
+          {{- include "cluster.nodeIP" .Values.networkData | nindent 10 }}
           node-labels: metal3.io/uuid={{ "{{" }} ds.meta_data.uuid {{ "}}" }}
           cpu-manager-policy: static
           topology-manager-policy: best-effort
@@ -29,11 +30,6 @@ spec:
     preKubeadmCommands:
 {{- if .Values.preKubeadmCommands }}
 {{ toYaml .Values.preKubeadmCommands | indent 4 }}
-{{- end }}
-{{- 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
 {{- 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"
@@ -67,6 +63,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.keepalived" .Values | indent 4 }}
 {{ include "cluster.containerRuntime" .Values | indent 4 }}
@@ -85,6 +83,10 @@ spec:
       permissions: '0777'
       content: |
 {{ $.Files.Get "resources/set_kernel_cmdline.sh" | indent 8 }}
+    - path: /usr/local/bin/enable_iscsi.sh
+      permissions: '0777'
+      content: |
+{{ $.Files.Get "resources/enable_iscsi.sh" | indent 8 }}
 {{- if eq .Values.cni "calico" }}
     - path: /etc/NetworkManager/conf.d/calico.conf
       content: |