From 6f049954dc19a80a9a5a51ba3ffc2b2e48775acd Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 7 Jan 2024 11:00:08 +0200 Subject: [PATCH 1/4] test: Wait 60 min for cluster to be deleted --- tests/e2e/kubetest2-kops/deployer/down.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/e2e/kubetest2-kops/deployer/down.go b/tests/e2e/kubetest2-kops/deployer/down.go index ca9f48b5fa..09e69ecf38 100644 --- a/tests/e2e/kubetest2-kops/deployer/down.go +++ b/tests/e2e/kubetest2-kops/deployer/down.go @@ -52,6 +52,9 @@ func (d *deployer) Down() error { d.KopsBinaryPath, "delete", "cluster", "--name", d.ClusterName, "--yes", + "--count=0", + "--interval=60s", + "--wait=60m", } klog.Info(strings.Join(args, " ")) cmd := exec.Command(args[0], args[1:]...) From f3c4d96a515f3c350e57c69673fe3fb9c6fa6c9a Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 7 Jan 2024 11:01:13 +0200 Subject: [PATCH 2/4] scale-test: Fix cluster deletion twice --- tests/e2e/scenarios/scalability/run-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/scenarios/scalability/run-test.sh b/tests/e2e/scenarios/scalability/run-test.sh index edf3a96cc9..7f11767da4 100755 --- a/tests/e2e/scenarios/scalability/run-test.sh +++ b/tests/e2e/scenarios/scalability/run-test.sh @@ -201,6 +201,6 @@ fi if [[ "${DELETE_CLUSTER:-}" == "true" ]]; then - kubetest2 kops "${KUBETEST2_ARGS[@]}" --down DELETE_CLUSTER=false # Don't delete again in trap + kubetest2 kops "${KUBETEST2_ARGS[@]}" --down fi From 6492bed1ebdb40f79501155321e9f350a9edb072 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 3 Jan 2024 06:58:54 +0200 Subject: [PATCH 3/4] scale-test: Use single nodes instance group for AWS --- tests/e2e/scenarios/scalability/run-test.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/e2e/scenarios/scalability/run-test.sh b/tests/e2e/scenarios/scalability/run-test.sh index 7f11767da4..c050f3319d 100755 --- a/tests/e2e/scenarios/scalability/run-test.sh +++ b/tests/e2e/scenarios/scalability/run-test.sh @@ -127,8 +127,11 @@ create_args+=("--master-size=${CONTROL_PLANE_SIZE:-c5.2xlarge}") create_args+=("--zones=us-east-2a,us-east-2b,us-east-2c") -# Enable cluster addons, this enables us to replace the built-in manifest -KOPS_FEATURE_FLAGS="ClusterAddons,${KOPS_FEATURE_FLAGS:-}" +# AWS ONLY feature flags +if [[ "${CLOUD_PROVIDER}" == "aws" ]]; then + # Enable creating a single nodes instance group + KOPS_FEATURE_FLAGS="AWSSingleNodesInstanceGroup,${KOPS_FEATURE_FLAGS:-}" +fi echo "KOPS_FEATURE_FLAGS=${KOPS_FEATURE_FLAGS}" From 09c170373b939a4d6ece7265c26e64a04f73ef95 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sat, 6 Jan 2024 09:36:30 +0200 Subject: [PATCH 4/4] scale-test: Increase CCM ConcurrentNodeSyncs --- 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 c050f3319d..f88b4227d4 100755 --- a/tests/e2e/scenarios/scalability/run-test.sh +++ b/tests/e2e/scenarios/scalability/run-test.sh @@ -95,6 +95,7 @@ create_args+=("--image=${INSTANCE_IMAGE:-ssm:/aws/service/canonical/ubuntu/serve create_args+=("--set spec.etcdClusters[0].manager.listenMetricsURLs=http://localhost:2382") create_args+=("--set spec.etcdClusters[0].manager.env=ETCD_QUOTA_BACKEND_BYTES=8589934592") create_args+=("--set spec.etcdClusters[1].manager.env=ETCD_QUOTA_BACKEND_BYTES=8589934592") +create_args+=("--set spec.cloudControllerManager.concurrentNodeSyncs=5") create_args+=("--set spec.kubelet.maxPods=96") create_args+=("--set spec.kubeScheduler.authorizationAlwaysAllowPaths=/healthz") create_args+=("--set spec.kubeScheduler.authorizationAlwaysAllowPaths=/metrics")