calico needs kubelet config —network-config=cni

pkg/acsengine/defaults-kubelet.go

@@ -61,7 +61,9 @@ func setKubeletConfig(cs *api.ContainerService) {
 
 	// Override default --network-plugin?
 	if o.KubernetesConfig.NetworkPlugin == NetworkPluginKubenet {
-		o.KubernetesConfig.KubeletConfig["--network-plugin"] = NetworkPluginKubenet
+		if o.KubernetesConfig.NetworkPolicy != NetworkPolicyCalico {
+			o.KubernetesConfig.KubeletConfig["--network-plugin"] = NetworkPluginKubenet
+		}
 		o.KubernetesConfig.KubeletConfig["--max-pods"] = strconv.Itoa(DefaultKubernetesMaxPods)
 	}
 

pkg/acsengine/defaults-kubelet_test.go

@@ -173,3 +173,14 @@ func TestKubeletMaxPods(t *testing.T) {
 			NetworkPluginKubenet, k["--max-pods"])
 	}
 }
+
+func TestKubeletCalico(t *testing.T) {
+	cs := createContainerService("testcluster", defaultTestClusterVer, 3, 2)
+	cs.Properties.OrchestratorProfile.KubernetesConfig.NetworkPolicy = NetworkPolicyCalico
+	setKubeletConfig(cs)
+	k := cs.Properties.OrchestratorProfile.KubernetesConfig.KubeletConfig
+	if k["--network-plugin"] != "cni" {
+		t.Fatalf("got unexpected '--network-plugin' kubelet config value for NetworkPolicy=%s: %s",
+			NetworkPolicyCalico, k["--network-plugin"])
+	}
+}