From 6e598a96ffc8e9e76f57487aab40d922ae554122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Zi=C4=99ba?= Date: Tue, 10 Nov 2020 13:23:47 +0000 Subject: [PATCH] Forbid creating clusters with more than 100 nodes without vpc-native --- cluster/gce/config-default.sh | 14 ++++++++++---- cluster/gce/config-test.sh | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 04b4c21d89e..1863a5f4dbf 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -350,10 +350,16 @@ if [ "${ENABLE_IP_ALIASES}" = true ]; then PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_IP_ALIASES" PROVIDER_VARS="${PROVIDER_VARS:-} NODE_IPAM_MODE" PROVIDER_VARS="${PROVIDER_VARS:-} SECONDARY_RANGE_NAME" -elif [[ -n "${MAX_PODS_PER_NODE:-}" ]]; then - # Should not have MAX_PODS_PER_NODE set for route-based clusters. - echo -e "${color_red:-}Cannot set MAX_PODS_PER_NODE for route-based projects for ${PROJECT}." >&2 - exit 1 +else + if [[ -n "${MAX_PODS_PER_NODE:-}" ]]; then + # Should not have MAX_PODS_PER_NODE set for route-based clusters. + echo -e "${color_red:-}Cannot set MAX_PODS_PER_NODE for route-based projects for ${PROJECT}." >&2 + exit 1 + fi + if [[ "$(get-num-nodes)" -gt 100 ]]; then + echo -e "${color_red:-}Cannot create cluster with more than 100 nodes for route-based projects for ${PROJECT}." >&2 + exit 1 + fi fi # Enable GCE Alpha features. diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index eb2273bf755..9b78547b842 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -385,10 +385,16 @@ if [ "${ENABLE_IP_ALIASES}" = true ]; then PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_IP_ALIASES" PROVIDER_VARS="${PROVIDER_VARS:-} NODE_IPAM_MODE" PROVIDER_VARS="${PROVIDER_VARS:-} SECONDARY_RANGE_NAME" -elif [[ -n "${MAX_PODS_PER_NODE:-}" ]]; then - # Should not have MAX_PODS_PER_NODE set for route-based clusters. - echo -e "${color_red:-}Cannot set MAX_PODS_PER_NODE for route-based projects for ${PROJECT}." >&2 - exit 1 +else + if [[ -n "${MAX_PODS_PER_NODE:-}" ]]; then + # Should not have MAX_PODS_PER_NODE set for route-based clusters. + echo -e "${color_red:-}Cannot set MAX_PODS_PER_NODE for route-based projects for ${PROJECT}." >&2 + exit 1 + fi + if [[ "$(get-num-nodes)" -gt 100 ]]; then + echo -e "${color_red:-}Cannot create cluster with more than 100 nodes for route-based projects for ${PROJECT}." >&2 + exit 1 + fi fi # Enable GCE Alpha features.