X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fcluster%2Ftemplates%2Fkubeadmcontrolplane.yaml;h=60134a4ee97b83a59062449cc4800f15e13361c3;hb=refs%2Fchanges%2F04%2F4804%2F1;hp=a17e95b8bf3a0cffee48e77885ea1e4254a087d4;hpb=e0cc710b6492af36ff547bd9b3990762976b52e4;p=icn.git

diff --git a/deploy/cluster/templates/kubeadmcontrolplane.yaml b/deploy/cluster/templates/kubeadmcontrolplane.yaml
index a17e95b..60134a4 100644
--- 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
@@ -27,16 +28,14 @@ spec:
           kube-reserved: cpu=200m,memory=512Mi
         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 4 }}
 {{- 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
 {{- if .Values.keepalived }}
     - apt-get install -y keepalived
@@ -82,6 +81,12 @@ spec:
       permissions: '0777'
       content: |
 {{ $.Files.Get "resources/set_kernel_cmdline.sh" | indent 8 }}
+{{- if eq .Values.cni "calico" }}
+    - path: /etc/NetworkManager/conf.d/calico.conf
+      content: |
+{{ $.Files.Get "resources/calico.conf" | indent 8 }}
+{{- end }}
+{{- if .Values.userData }}
     users:
     - name: {{ .Values.userData.name }}
       shell: /bin/bash
@@ -94,6 +99,7 @@ spec:
     - name: root
       sshAuthorizedKeys:
       - {{ .Values.userData.sshAuthorizedKey }}
+{{- end }}
   machineTemplate:
     infrastructureRef:
       apiVersion: infrastructure.cluster.x-k8s.io/v1alpha5