Merge pull request #8902 from ykakarap/ps-scale-e2e-modify

🌱 modify scale e2e test defaults
kubernetes-sigs · Jun 23, 2023 · 3ac273b · 3ac273b
2 parents e8eb540 + 7cd6a91
commit 3ac273b
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 5 deletions.
diff --git a/test/e2e/data/infrastructure-inmemory/main/clusterclass-in-memory.yaml b/test/e2e/data/infrastructure-inmemory/main/clusterclass-in-memory.yaml
@@ -20,6 +20,14 @@ spec:
       apiVersion: controlplane.cluster.x-k8s.io/v1beta1
       kind: KubeadmControlPlaneTemplate
       name: in-memory-control-plane
+    machineHealthCheck:
+      unhealthyConditions:
+        - type: Ready
+          status: Unknown
+          timeout: 300s
+        - type: Ready
+          status: "False"
+          timeout: 300s
   infrastructure:
     ref:
       apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
@@ -39,6 +47,14 @@ spec:
               apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
               kind: InMemoryMachineTemplate
               name: in-memory-default-worker-machinetemplate
+        machineHealthCheck:
+          unhealthyConditions:
+            - type: Ready
+              status: Unknown
+              timeout: 300s
+            - type: Ready
+              status: "False"
+              timeout: 300s
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
 kind: InMemoryClusterTemplate
@@ -83,15 +99,49 @@ metadata:
   name: in-memory-control-plane
 spec:
   template:
-    spec: {}
+    spec:
+      behaviour:
+        vm:
+          provisioning:
+            startupDuration: "30s"
+            startupJitter: "0.2"
+        node:
+          provisioning:
+            startupDuration: "10s"
+            startupJitter: "0.2"
+        apiServer:
+          provisioning:
+            startupDuration: "10s"
+            startupJitter: "0.2"
+        etcd:
+          provisioning:
+            startupDuration: "10s"
+            startupJitter: "0.2"
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
 kind: InMemoryMachineTemplate
 metadata:
   name: in-memory-default-worker-machinetemplate
 spec:
   template:
-    spec: {}
+    spec:
+      behaviour:
+        vm:
+          provisioning:
+            startupDuration: "30s"
+            startupJitter: "0.2"
+        node:
+          provisioning:
+            startupDuration: "10s"
+            startupJitter: "0.2"
+        apiServer:
+          provisioning:
+            startupDuration: "10s"
+            startupJitter: "0.2"
+        etcd:
+          provisioning:
+            startupDuration: "10s"
+            startupJitter: "0.2"
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate

diff --git a/test/e2e/scale_test.go b/test/e2e/scale_test.go
@@ -35,7 +35,7 @@ var _ = Describe("When scale testing using in-memory provider [Scale]", func() {
 			ClusterCount:             pointer.Int64(10),
 			Concurrency:              pointer.Int64(5),
 			Flavor:                   pointer.String(""),
-			ControlPlaneMachineCount: pointer.Int64(3),
+			ControlPlaneMachineCount: pointer.Int64(1),
 			WorkerMachineCount:       pointer.Int64(3),
 		}
 	})

diff --git a/test/infrastructure/inmemory/templates/clusterclass-in-memory-quick-start.yaml b/test/infrastructure/inmemory/templates/clusterclass-in-memory-quick-start.yaml
@@ -20,6 +20,14 @@ spec:
       apiVersion: controlplane.cluster.x-k8s.io/v1beta1
       kind: KubeadmControlPlaneTemplate
       name: in-memory-quick-start-control-plane
+    machineHealthCheck:
+      unhealthyConditions:
+        - type: Ready
+          status: Unknown
+          timeout: 300s
+        - type: Ready
+          status: "False"
+          timeout: 300s
   infrastructure:
     ref:
       apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
@@ -39,6 +47,14 @@ spec:
               apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
               kind: InMemoryMachineTemplate
               name: in-memory-quick-start-default-worker-machinetemplate
+        machineHealthCheck:
+          unhealthyConditions:
+            - type: Ready
+              status: Unknown
+              timeout: 300s
+            - type: Ready
+              status: "False"
+              timeout: 300s
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
 kind: InMemoryClusterTemplate
@@ -83,15 +99,49 @@ metadata:
   name: in-memory-quick-start-control-plane
 spec:
   template:
-    spec: {}
+    spec:
+      behaviour:
+        vm:
+          provisioning:
+            startupDuration: "30s"
+            startupJitter: "0.2"
+        node:
+          provisioning:
+            startupDuration: "10s"
+            startupJitter: "0.2"
+        apiServer:
+          provisioning:
+            startupDuration: "10s"
+            startupJitter: "0.2"
+        etcd:
+          provisioning:
+            startupDuration: "10s"
+            startupJitter: "0.2"
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
 kind: InMemoryMachineTemplate
 metadata:
   name: in-memory-quick-start-default-worker-machinetemplate
 spec:
   template:
-    spec: {}
+    spec:
+      behaviour:
+        vm:
+          provisioning:
+            startupDuration: "30s"
+            startupJitter: "0.2"
+        node:
+          provisioning:
+            startupDuration: "10s"
+            startupJitter: "0.2"
+        apiServer:
+          provisioning:
+            startupDuration: "10s"
+            startupJitter: "0.2"
+        etcd:
+          provisioning:
+            startupDuration: "10s"
+            startupJitter: "0.2"
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate