Removed calico+azureipam plugin option

Azure · Mar 4, 2019 · addab61 · addab61
1 parent 6245e26
commit addab61
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 17 deletions.
diff --git a/parts/k8s/kubernetesinstalls.sh b/parts/k8s/kubernetesinstalls.sh
@@ -169,7 +169,7 @@ installClearContainersRuntime() {
 }
 
 installNetworkPlugin() {
-    if [[ "${NETWORK_PLUGIN}" = "azure" ]] || [[ "${NETWORK_PLUGIN}" = "calico+azureipam"  ]]; then
+    if [ "${NETWORK_PLUGIN}" = "azure" ]; then
         installAzureCNI
     fi
     installCNI

diff --git a/parts/k8s/kubernetesmastercustomdata.yml b/parts/k8s/kubernetesmastercustomdata.yml
@@ -318,9 +318,6 @@ MASTER_ARTIFACTS_CONFIG_PLACEHOLDER
     sed -i "s|<kubeClusterCidr>|{{WrapAsParameter "kubeClusterCidr"}}|g" /etc/kubernetes/addons/calico-daemonset.yaml
     {{if eq .OrchestratorProfile.KubernetesConfig.NetworkPlugin "azure"}}
     sed -i "/initContainers/,/cni-net-dir/d" /etc/kubernetes/addons/calico-daemonset.yaml
-    {{else if eq .OrchestratorProfile.KubernetesConfig.NetworkPlugin "calico+azureipam"}}
-    sed -i "s|<calicoIPAMConfig>|{\"type\": \"azure-vnet-ipam\"}|g" /etc/kubernetes/addons/calico-daemonset.yaml
-    sed -i "s|azv|cali|g" /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

diff --git a/parts/k8s/kubernetesparams.t b/parts/k8s/kubernetesparams.t
@@ -348,14 +348,13 @@
     "networkPlugin": {
       "defaultValue": "{{.OrchestratorProfile.KubernetesConfig.NetworkPlugin}}",
       "metadata": {
-        "description": "The network plugin to use for Kubernetes (kubenet|azure|flannel|cilium|calico+azureipam)"
+        "description": "The network plugin to use for Kubernetes (kubenet|azure|flannel|cilium)"
       },
       "allowedValues": [
         "kubenet",
         "azure",
         "flannel",
-        "cilium",
-        "calico+azureipam"
+        "cilium"
       ],
       "type": "string"
     },

diff --git a/pkg/api/vlabs/const.go b/pkg/api/vlabs/const.go
@@ -75,7 +75,7 @@ const (
 
 var (
 	// NetworkPluginValues holds the valid values for network plugin implementation
-	NetworkPluginValues = [...]string{"", "kubenet", "azure", "cilium", "flannel", "calico+azureipam"}
+	NetworkPluginValues = [...]string{"", "kubenet", "azure", "cilium", "flannel"}
 
 	// NetworkPolicyValues holds the valid values for a network policy
 	// "azure" and "none" are there for backwards-compatibility

diff --git a/pkg/api/vlabs/validate.go b/pkg/api/vlabs/validate.go
@@ -71,10 +71,6 @@ var (
 			networkPlugin: "azure",
 			networkPolicy: "calico",
 		},
-		{
-			networkPlugin: "calico+azureipam",
-			networkPolicy: "calico",
-		},
 		{
 			networkPlugin: "",
 			networkPolicy: "calico",

diff --git a/pkg/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go
@@ -627,11 +627,11 @@ func Test_Properties_ValidateNetworkPluginPlusPolicy(t *testing.T) {
 			networkPolicy: "flannel",
 		},
 		{
-			networkPlugin: "kubenet",
-			networkPolicy: "none",
+			networkPlugin: "azure",
+			networkPolicy: "calico",
 		},
 		{
-			networkPlugin: "calico+azureipam",
+			networkPlugin: "kubenet",
 			networkPolicy: "none",
 		},
 		{

diff --git a/pkg/engine/const.go b/pkg/engine/const.go
@@ -23,8 +23,6 @@ const (
 	NetworkPluginKubenet = "kubenet"
 	// NetworkPluginFlannel is the string expression for flannel network plugin
 	NetworkPluginFlannel = "flannel"
-	// NetworkPluginCalicoAzureIPAM is the string expression for calico+azureipam plugin
-	NetworkPluginCalicoAzureIPAM = "calico+azureipam"
 	// DefaultKubeHeapsterDeploymentAddonName is the name of the kube-heapster-deployment addon
 	DefaultKubeHeapsterDeploymentAddonName = "kube-heapster-deployment"
 	// DefaultKubeDNSDeploymentAddonName is the name of the kube-dns-deployment addon