Run kubeadm init with the --pod-network-cidr option

Use --pod-network-cidr to install appropriate iptable rules Change-Id: I9e72e11b0e0c8941d89b84120f7c32d0d07f5a9d Closes-Bug: #1781319
Juniper · Aug 2, 2018 · 1a8ed2f · 1a8ed2f
1 parent b4b1ff3
commit 1a8ed2f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/playbooks/roles/k8s/defaults/main.yml b/playbooks/roles/k8s/defaults/main.yml
@@ -0,0 +1,8 @@
+---
+
+kube_pod_subnet: >-
+    {%- if contrail_configuration is defined -%}
+      {{ contrail_configuration.get('KUBERNETES_POD_SUBNETS', '10.32.0.0/12') }}
+    {%- else -%}
+      {{ '10.32.0.0/12' }}
+    {%- endif -%}
diff --git a/playbooks/roles/k8s/tasks/configure_k8s_master_node.yml b/playbooks/roles/k8s/tasks/configure_k8s_master_node.yml
@@ -77,15 +77,15 @@
 
 - name: initialize k8s master with listen ip
   shell: |
-      kubeadm init --token-ttl 0 --kubernetes-version {{ k8s_version }} --apiserver-advertise-address {{ listen_ip }} &&
+      kubeadm init --token-ttl 0 --kubernetes-version {{ k8s_version }} --apiserver-advertise-address {{ listen_ip }} --pod-network-cidr {{ kube_pod_subnet }} &&
       mkdir -p $HOME/.kube &&
       cp -u /etc/kubernetes/admin.conf $HOME/.kube/config &&
       chown -R $(id -u):$(id -g) $HOME/.kube
   when: listen_ip is defined and master_running == false
 
 - name: initialize k8s master without listen ip
   shell: |
-      kubeadm init --token-ttl 0 --kubernetes-version {{ k8s_version }} &&
+      kubeadm init --token-ttl 0 --kubernetes-version {{ k8s_version }} --pod-network-cidr {{ kube_pod_subnet }} &&
       mkdir -p $HOME/.kube &&
       cp -u /etc/kubernetes/admin.conf $HOME/.kube/config &&
       chown -R $(id -u):$(id -g) $HOME/.kube