From 4489f8164623a24e039fd59eb7a1a132f1f26e7b Mon Sep 17 00:00:00 2001 From: Piotr Halama Date: Thu, 16 May 2024 15:34:18 +0200 Subject: [PATCH] fix list of zones --- .../scripts/custom-domain-gardener-aws-gh.sh | 1 - .../scripts/custom-domain-gardener-gcp-gh.sh | 1 - tests/integration/scripts/shoot_aws.yaml | 18 ++++++++++++++---- tests/integration/scripts/shoot_gcp.yaml | 6 ++++-- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/tests/integration/scripts/custom-domain-gardener-aws-gh.sh b/tests/integration/scripts/custom-domain-gardener-aws-gh.sh index a69b1a0b4..0ec6979c6 100755 --- a/tests/integration/scripts/custom-domain-gardener-aws-gh.sh +++ b/tests/integration/scripts/custom-domain-gardener-aws-gh.sh @@ -13,7 +13,6 @@ export SCALER_MAX=3 export SCALER_MIN=1 export GARDENER_PROVIDER="aws" export GARDENER_REGION="eu-west-1" -export GARDENER_ZONES="eu-west-1b,eu-west-1c,eu-west-1a" export GARDENER_PROVIDER_SECRET_NAME="aws-gardener-access" export GARDENER_PROJECT_NAME="goatz" export GARDENER_CLUSTER_VERSION="1.27.8" diff --git a/tests/integration/scripts/custom-domain-gardener-gcp-gh.sh b/tests/integration/scripts/custom-domain-gardener-gcp-gh.sh index a54c0a910..0d0c985b6 100755 --- a/tests/integration/scripts/custom-domain-gardener-gcp-gh.sh +++ b/tests/integration/scripts/custom-domain-gardener-gcp-gh.sh @@ -13,7 +13,6 @@ export SCALER_MAX=3 export SCALER_MIN=1 export GARDENER_PROVIDER="gcp" export GARDENER_REGION="europe-west3" -export GARDENER_ZONES="europe-west3-c,europe-west3-b,europe-west3-a" export GARDENER_PROVIDER_SECRET_NAME="goat" export GARDENER_PROJECT_NAME="goatz" export GARDENER_CLUSTER_VERSION="1.27.8" diff --git a/tests/integration/scripts/shoot_aws.yaml b/tests/integration/scripts/shoot_aws.yaml index 4f2c7d7cb..a9fd9c2bf 100644 --- a/tests/integration/scripts/shoot_aws.yaml +++ b/tests/integration/scripts/shoot_aws.yaml @@ -16,10 +16,18 @@ spec: vpc: cidr: 10.250.0.0/16 zones: - - name: ${GARDENER_ZONES} - internal: 10.250.112.0/22 - public: 10.250.96.0/22 + - name: ${GARDENER_REGION}a + internal: 10.250.48.0/20 + public: 10.250.32.0/20 workers: 10.250.0.0/19 + - name: ${GARDENER_REGION}b + internal: 10.250.112.0/20 + public: 10.250.96.0/20 + workers: 10.250.64.0/19 + - name: ${GARDENER_REGION}c + internal: 10.250.176.0/20 + public: 10.250.160.0/20 + workers: 10.250.128.0/19 workers: - name: cpu-worker minimum: ${SCALER_MIN} @@ -30,7 +38,9 @@ spec: type: ${DISK_TYPE} size: ${DISK_SIZE}Gi zones: - - ${GARDENER_ZONES} + - ${GARDENER_REGION}a + - ${GARDENER_REGION}b + - ${GARDENER_REGION}c networking: type: calico pods: 100.96.0.0/11 diff --git a/tests/integration/scripts/shoot_gcp.yaml b/tests/integration/scripts/shoot_gcp.yaml index f3a2b8dbf..528eed30f 100644 --- a/tests/integration/scripts/shoot_gcp.yaml +++ b/tests/integration/scripts/shoot_gcp.yaml @@ -17,7 +17,7 @@ spec: controlPlaneConfig: apiVersion: gcp.provider.extensions.gardener.cloud/v1alpha1 kind: ControlPlaneConfig - zone: ${GARDENER_ZONES} + zone: ${GARDENER_REGION}-a workers: - name: cpu-worker minimum: ${SCALER_MIN} @@ -28,7 +28,9 @@ spec: type: ${DISK_TYPE} size: ${DISK_SIZE}Gi zones: - - ${GARDENER_ZONES} + - ${GARDENER_REGION}-a + - ${GARDENER_REGION}-b + - ${GARDENER_REGION}-c networking: type: calico pods: 100.96.0.0/11