Merge pull request #63074 from shyamjvs/fix-ip-alias-bug

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix IP_ALIAS_SUBNETWORK env var assignment in GCE setup /cc @wojtek-t ```release-note NONE ```

Merge pull request #63074 from shyamjvs/fix-ip-alias-bug
f646ece9 · Kubernetes Submit Queue · GitHub · 5b0df365 · 7fb7e6f8 · f646ece9
Unverified Commit f646ece9 authored Apr 24, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

config-default.sh cluster/gce/config-default.sh +1 -1

config-test.sh cluster/gce/config-test.sh +1 -1

No files found.
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -295,7 +295,7 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then
  # If we're using custom network, use the subnet we already create for it as the one for ip-alias.
  # Note that this means SUBNETWORK would override KUBE_GCE_IP_ALIAS_SUBNETWORK in case of custom network.
  if [[ "${CREATE_CUSTOM_NETWORK}" == true ]]; then
-    IP_ALIAS_SUBNETWORK="${SUBNETWORK:-IP_ALIAS_SUBNETWORK}"
+    IP_ALIAS_SUBNETWORK="${SUBNETWORK}"
  fi
  # Reserve the services IP space to avoid being allocated for other GCP resources.
  SERVICE_CLUSTER_IP_SUBNETWORK=${KUBE_GCE_SERVICE_CLUSTER_IP_SUBNETWORK:-${INSTANCE_PREFIX}-subnet-services}

--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -302,7 +302,7 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then
  # If we're using custom network, use the subnet we already create for it as the one for ip-alias.
  # Note that this means SUBNETWORK would override KUBE_GCE_IP_ALIAS_SUBNETWORK in case of custom network.
  if [[ "${CREATE_CUSTOM_NETWORK}" == true ]]; then
-    IP_ALIAS_SUBNETWORK="${SUBNETWORK:-IP_ALIAS_SUBNETWORK}"
+    IP_ALIAS_SUBNETWORK="${SUBNETWORK}"
  fi
  # Reserve the services IP space to avoid being allocated for other GCP resources.
  SERVICE_CLUSTER_IP_SUBNETWORK=${KUBE_GCE_SERVICE_CLUSTER_IP_SUBNETWORK:-${INSTANCE_PREFIX}-subnet-services}