From 5cd3300315282222d8beee672ca6ccc0c8b3c092 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 15 Aug 2023 19:36:08 +0300 Subject: [PATCH 1/3] Use us-east-2 region for scale tests --- tests/e2e/scenarios/scalability/run-test.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/e2e/scenarios/scalability/run-test.sh b/tests/e2e/scenarios/scalability/run-test.sh index a0679f28a4..cd0b846bea 100755 --- a/tests/e2e/scenarios/scalability/run-test.sh +++ b/tests/e2e/scenarios/scalability/run-test.sh @@ -102,9 +102,7 @@ create_args+=("--dns none") create_args+=("--node-size=c6g.medium") create_args+=("--control-plane-count=${CONTROL_PLANE_COUNT:-1}") create_args+=("--master-size=${CONTROL_PLANE_SIZE:-c6g.2xlarge}") -if [[ -n "${ZONES:-}" ]]; then - create_args+=("--zones=${ZONES}") -fi +create_args+=("--zones=us-east-2a,us-east-2b,us-east-2c") # Enable cluster addons, this enables us to replace the built-in manifest From 5ca58836a381fd9733ef7b3c1f47fcd53677964a Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 15 Aug 2023 19:36:51 +0300 Subject: [PATCH 2/3] Use 10.0.0.0/16 network for scale tests --- tests/e2e/scenarios/scalability/run-test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/e2e/scenarios/scalability/run-test.sh b/tests/e2e/scenarios/scalability/run-test.sh index cd0b846bea..fd4bcb1b18 100755 --- a/tests/e2e/scenarios/scalability/run-test.sh +++ b/tests/e2e/scenarios/scalability/run-test.sh @@ -86,6 +86,7 @@ echo "ADMIN_ACCESS=${ADMIN_ACCESS}" # cilium does not yet pass conformance tests (shared hostport test) #create_args="--networking cilium" create_args=() +create_args=("--network-cidr=10.0.0.0/16") create_args+=("--networking=${CNI_PLUGIN:-calico}") if [[ "${CNI_PLUGIN}" == "amazonvpc" ]]; then create_args+=("--set spec.networking.amazonVPC.env=ENABLE_PREFIX_DELEGATION=true") From b8594e4c21b014c9ef8c2cf1527c743ed3988bf5 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 16 Aug 2023 07:46:55 +0300 Subject: [PATCH 3/3] gce: Skip failing Cilium test --- tests/e2e/pkg/tester/skip_regex.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/e2e/pkg/tester/skip_regex.go b/tests/e2e/pkg/tester/skip_regex.go index ff40f3a88c..754f8f0f3b 100644 --- a/tests/e2e/pkg/tester/skip_regex.go +++ b/tests/e2e/pkg/tester/skip_regex.go @@ -76,6 +76,10 @@ func (t *Tester) setSkipRegexFlag() error { // https://github.com/cilium/cilium/issues/9207 skipRegex += "|serve.endpoints.on.same.port.and.different.protocols" + if cluster.Spec.LegacyCloudProvider == "gce" { + skipRegex += "|fallback.to.local.terminating.endpoints.when.there.are.no.ready.endpoints.with.externalTrafficPolicy.Local" + } + if isPre28 { // These may be fixed in Cilium 1.13 but skipping for now skipRegex += "|Service.with.multiple.ports.specified.in.multiple.EndpointSlices"