kubernetesNonMasqueradeCidr not needed for AKS

Azure · Oct 5, 2018 · 8a34023 · 8a34023
1 parent 61e5838
commit 8a34023
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/parts/k8s/kubernetesparams.t b/parts/k8s/kubernetesparams.t
@@ -201,13 +201,15 @@
       },
       "type": "string"
     },
+{{if not IsHostedMaster}}
     "kubernetesNonMasqueradeCidr": {
       "metadata": {
         "description": "kubernetesNonMasqueradeCidr cluster subnet"
       },
       "defaultValue": "{{GetDefaultVNETCIDR}}",
       "type": "string"
     },
+{{end}}
     "kubernetesKubeletClusterDomain": {
       "metadata": {
         "description": "--cluster-domain Kubelet config"

diff --git a/pkg/acsengine/params_k8s.go b/pkg/acsengine/params_k8s.go
@@ -269,8 +269,6 @@ func assignKubernetesParameters(properties *api.Properties, parametersMap params
 				} else {
 					addValue(parametersMap, "kubernetesNonMasqueradeCidr", properties.OrchestratorProfile.KubernetesConfig.ClusterSubnet)
 				}
-			} else {
-				addValue(parametersMap, "kubernetesNonMasqueradeCidr", kubernetesConfig.KubeletConfig["--non-masquerade-cidr"])
 			}
 			addValue(parametersMap, "kubernetesKubeletClusterDomain", kubernetesConfig.KubeletConfig["--cluster-domain"])
 			addValue(parametersMap, "dockerBridgeCidr", kubernetesConfig.DockerBridgeSubnet)