chore: Update calico to 3.5 and allow calico to work with azure CNI

Azure · Mar 28, 2019 · c1f8add · c1f8add
1 parent b45eb04
commit c1f8add
Show file tree

Hide file tree

Showing 10 changed files with 2,876 additions and 2,710 deletions.
diff --git a/parts/k8s/addons/1.10/kubernetesmasteraddons-calico-daemonset.yaml b/parts/k8s/addons/1.10/kubernetesmasteraddons-calico-daemonset.yaml
diff --git a/parts/k8s/addons/1.11/kubernetesmasteraddons-calico-daemonset.yaml b/parts/k8s/addons/1.11/kubernetesmasteraddons-calico-daemonset.yaml
diff --git a/parts/k8s/addons/1.7/kubernetesmasteraddons-calico-daemonset.yaml b/parts/k8s/addons/1.7/kubernetesmasteraddons-calico-daemonset.yaml
diff --git a/parts/k8s/addons/1.8/kubernetesmasteraddons-calico-daemonset.yaml b/parts/k8s/addons/1.8/kubernetesmasteraddons-calico-daemonset.yaml
diff --git a/parts/k8s/addons/1.9/kubernetesmasteraddons-calico-daemonset.yaml b/parts/k8s/addons/1.9/kubernetesmasteraddons-calico-daemonset.yaml
diff --git a/parts/k8s/addons/kubernetesmasteraddons-calico-daemonset.yaml b/parts/k8s/addons/kubernetesmasteraddons-calico-daemonset.yaml
diff --git a/parts/k8s/kubernetesconfigs.sh b/parts/k8s/kubernetesconfigs.sh
@@ -191,9 +191,10 @@ configureCNI() {
     retrycmd_if_failure 120 5 25 modprobe br_netfilter || exit $ERR_MODPROBE_FAIL
     echo -n "br_netfilter" > /etc/modules-load.d/br_netfilter.conf
     if [[ "${NETWORK_PLUGIN}" = "azure" ]]; then
-        if [[ "${NETWORK_POLICY}" != "calico" ]]; then
-            mv $CNI_BIN_DIR/10-azure.conflist $CNI_CONFIG_DIR/
-            chmod 600 $CNI_CONFIG_DIR/10-azure.conflist
+        mv $CNI_BIN_DIR/10-azure.conflist $CNI_CONFIG_DIR/
+        chmod 600 $CNI_CONFIG_DIR/10-azure.conflist
+        if [[ "${NETWORK_POLICY}" == "calico" ]]; then
+          sed -i 's#"mode":"bridge"#"mode":"transparent"#g' $CNI_CONFIG_DIR/10-azure.conflist
         fi
         /sbin/ebtables -t nat --list
     fi

diff --git a/parts/k8s/kubernetesmastercustomdata.yml b/parts/k8s/kubernetesmastercustomdata.yml
@@ -362,9 +362,10 @@ 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
+    sed -i "/initContainers/,/cni-net-dir/d" /etc/kubernetes/addons/calico-daemonset.yaml
     {{else}}
     sed -i "s|<calicoIPAMConfig>|{\"type\": \"host-local\", \"subnet\": \"usePodCidr\"}|g" /etc/kubernetes/addons/calico-daemonset.yaml
+    sed -i "s|azv|cali|g" /etc/kubernetes/addons/calico-daemonset.yaml
     {{end}}
 {{end}}
 {{if eq .OrchestratorProfile.KubernetesConfig.NetworkPlugin "flannel"}}

diff --git a/pkg/api/addons.go b/pkg/api/addons.go
@@ -364,5 +364,5 @@ func azureNetworkPolicyAddonEnabled(o *OrchestratorProfile) *bool {
 }
 
 func azureCNINetworkMonitorAddonEnabled(o *OrchestratorProfile) *bool {
-	return to.BoolPtr(o.IsAzureCNI())
+	return to.BoolPtr(o.IsAzureCNI() && o.KubernetesConfig.NetworkPolicy != NetworkPolicyCalico)
 }
diff --git a/pkg/engine/const.go b/pkg/engine/const.go
@@ -36,7 +36,7 @@ const (
 	NetworkPluginAzure = "azure"
 	// NetworkPluginKubenet is the string expression for kubenet network plugin
 	NetworkPluginKubenet = "kubenet"
-	// NetworkPluginFlannel is the string expression for flannel network policy config option
+	// NetworkPluginFlannel is the string expression for flannel network plugin
 	NetworkPluginFlannel = "flannel"
 	// DefaultKubeHeapsterDeploymentAddonName is the name of the kube-heapster-deployment addon
 	DefaultKubeHeapsterDeploymentAddonName = "kube-heapster-deployment"