X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fcluster%2Ftemplates%2Fkubeadmconfigtemplate.yaml;h=9250cc57a75cd453701ff97359c734281ad149de;hb=adbd076f40c348b04e52321c3c5cdaa528915f1a;hp=c56ed0ff88f0531a181bb0d5e3b83648780b640b;hpb=7f5b95aaf15bca22ac6506ac5e1b5db0d0437222;p=icn.git

diff --git a/deploy/cluster/templates/kubeadmconfigtemplate.yaml b/deploy/cluster/templates/kubeadmconfigtemplate.yaml
index c56ed0f..9250cc5 100644
--- a/deploy/cluster/templates/kubeadmconfigtemplate.yaml
+++ b/deploy/cluster/templates/kubeadmconfigtemplate.yaml
@@ -9,22 +9,21 @@ 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"
       - curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
       - add-apt-repository "deb https://apt.kubernetes.io/ kubernetes-xenial main"
-      - apt update -y
+      - apt-get update -y
       - apt-get install -y ca-certificates
       - /usr/local/bin/install-container-runtime.sh
       - apt-get install -y kubelet={{ .Values.kubeVersion }} kubeadm={{ .Values.kubeVersion }} kubectl={{ .Values.kubeVersion }}
@@ -47,6 +46,12 @@ spec:
         permissions: '0777'
         content: |
 {{ $.Files.Get "resources/set_kernel_cmdline.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 }}
         shell: /bin/bash
@@ -59,3 +64,4 @@ spec:
       - name: root
         sshAuthorizedKeys:
         - {{ .Values.userData.sshAuthorizedKey }}
+{{- end }}