From 7fb7e6f89058153f2cea9d34290d2afc36859a78 Mon Sep 17 00:00:00 2001 From: Shyam Jeedigunta Date: Tue, 24 Apr 2018 14:37:18 +0200 Subject: [PATCH] Fix IP_ALIAS_SUBNETWORK env var assignment in GCE setup --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 5bdc4745a38..9a2be88efe4 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -298,7 +298,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} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index a3e586876c0..4ce0e4dc670 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -305,7 +305,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}