Set IPAM config based on specified network plugin

Azure · Nov 2, 2018 · 9af6a1e · 9af6a1e
1 parent 21f12a1
commit 9af6a1e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/parts/k8s/addons/1.10/kubernetesmasteraddons-calico-daemonset.yaml b/parts/k8s/addons/1.10/kubernetesmasteraddons-calico-daemonset.yaml
@@ -1,9 +1,3 @@
-# Calico Version v3.1.3
-# https://docs.projectcalico.org/v3.1/releases#v3.1.3
-# This manifest includes the following component versions:
-#   calico/node:v3.1.3
-#   calico/cni:v3.1.3
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -136,9 +130,7 @@ data:
           "datastore_type": "kubernetes",
           "nodename": "__KUBERNETES_NODE_NAME__",
           "mtu": 1500,
-          "ipam": {
-              "type": "azure-vnet-ipam"
-          },
+          "ipam": <calicoIPAMConfig>,
           "policy": {
               "type": "k8s"
           },

diff --git a/parts/k8s/addons/kubernetesmasteraddons-calico-daemonset.yaml b/parts/k8s/addons/kubernetesmasteraddons-calico-daemonset.yaml
@@ -1,9 +1,3 @@
-# Calico Version v3.1.3
-# https://docs.projectcalico.org/v3.1/releases#v3.1.3
-# This manifest includes the following component versions:
-#   calico/node:v3.1.3
-#   calico/cni:v3.1.3
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -136,9 +130,7 @@ data:
           "datastore_type": "kubernetes",
           "nodename": "__KUBERNETES_NODE_NAME__",
           "mtu": 1500,
-          "ipam": {
-              "type": "azure-vnet-ipam"
-          },
+          "ipam": <calicoIPAMConfig>,
           "policy": {
               "type": "k8s"
           },

diff --git a/parts/k8s/kubernetesmastercustomdata.yml b/parts/k8s/kubernetesmastercustomdata.yml
@@ -377,6 +377,11 @@ MASTER_ARTIFACTS_CONFIG_PLACEHOLDER
 
 {{if eq .OrchestratorProfile.KubernetesConfig.NetworkPolicy "calico"}}
     sed -i "s|<kubeClusterCidr>|{{WrapAsParameter "kubeClusterCidr"}}|g" "/etc/kubernetes/addons/calico-daemonset.yaml"
+    {{if eq .OrchestratorProfile.KubernetesConfig.NetworkPlugin "azure"}}
+    sed -i "s|<calicoIPAMConfig>|{\"type\": \"azure-vnet-ipam\"}|g" "/etc/kubernetes/addons/calico-daemonset.yaml"
+    {{else}}
+    sed -i "s|<calicoIPAMConfig>|{\"type\": \"host-local\", \"subnet\": \"usePodCidr\"}|g" "/etc/kubernetes/addons/calico-daemonset.yaml"
+    {{end}}
 {{end}}
 {{if eq .OrchestratorProfile.KubernetesConfig.NetworkPlugin "flannel"}}
     sed -i "s|<kubeClusterCidr>|{{WrapAsParameter "kubeClusterCidr"}}|g" "/etc/kubernetes/addons/flannel-daemonset.yaml"