From a35dcec8961ea6fcae3a37c275904658c771558a Mon Sep 17 00:00:00 2001 From: Jing Ai Date: Thu, 25 Jan 2018 18:25:06 -0800 Subject: [PATCH 1/3] Fix GCE IP Aliases CI https://k8s-testgrid.appspot.com/google-gce#gci-gce-ip-alias failure cause by pull #56132. --- cluster/gce/config-test.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 93b92b5b375..af04e73a6c2 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -291,14 +291,19 @@ ENABLE_RESCHEDULER="${KUBE_ENABLE_RESCHEDULER:-true}" # IP_ALIAS_SUBNETWORK is the subnetwork to allocate from. If empty, a # new subnetwork will be created for the cluster. ENABLE_IP_ALIASES=${KUBE_GCE_ENABLE_IP_ALIASES:-false} +NODE_IPAM_MODE=${KUBE_GCE_NODE_IPAM_MODE:-RangeAllocator} if [ ${ENABLE_IP_ALIASES} = true ]; then # Size of ranges allocated to each node. gcloud current supports only /32 and /24. IP_ALIAS_SIZE=${KUBE_GCE_IP_ALIAS_SIZE:-/24} IP_ALIAS_SUBNETWORK=${KUBE_GCE_IP_ALIAS_SUBNETWORK:-${INSTANCE_PREFIX}-subnet-default} # 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} + NODE_IPAM_MODE=${KUBE_GCE_NODE_IPAM_MODE:-CloudAllocator} + SECONDARY_RANGE_NAME=${SECONDARY_RANGE_NAME:-} # Add to the provider custom variables. PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_IP_ALIASES" + PROVIDER_VARS="${PROVIDER_VARS:-} NODE_IPAM_MODE" + PROVIDER_VARS="${PROVIDER_VARS:-} SECONDARY_RANGE_NAME" fi # Enable GCE Alpha features. From 3831dd0391e3e430efdc0293365a4873fcc8e12e Mon Sep 17 00:00:00 2001 From: Jing Ai Date: Thu, 25 Jan 2018 20:15:14 -0800 Subject: [PATCH 2/3] Remove changes on SECONDARY_RANGE_NAME. --- cluster/gce/config-test.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index af04e73a6c2..81948d0d2a9 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -299,11 +299,9 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then # 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} NODE_IPAM_MODE=${KUBE_GCE_NODE_IPAM_MODE:-CloudAllocator} - SECONDARY_RANGE_NAME=${SECONDARY_RANGE_NAME:-} # Add to the provider custom variables. PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_IP_ALIASES" PROVIDER_VARS="${PROVIDER_VARS:-} NODE_IPAM_MODE" - PROVIDER_VARS="${PROVIDER_VARS:-} SECONDARY_RANGE_NAME" fi # Enable GCE Alpha features. From d8e97cb852f7dcf71af7b4e007760ad6522df257 Mon Sep 17 00:00:00 2001 From: Jing Ai Date: Thu, 25 Jan 2018 20:37:26 -0800 Subject: [PATCH 3/3] Revert "Remove changes on SECONDARY_RANGE_NAME." This reverts commit 3831dd0391e3e430efdc0293365a4873fcc8e12e. --- cluster/gce/config-test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 81948d0d2a9..af04e73a6c2 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -299,9 +299,11 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then # 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} NODE_IPAM_MODE=${KUBE_GCE_NODE_IPAM_MODE:-CloudAllocator} + SECONDARY_RANGE_NAME=${SECONDARY_RANGE_NAME:-} # Add to the provider custom variables. PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_IP_ALIASES" PROVIDER_VARS="${PROVIDER_VARS:-} NODE_IPAM_MODE" + PROVIDER_VARS="${PROVIDER_VARS:-} SECONDARY_RANGE_NAME" fi # Enable GCE Alpha features.