diff --git a/test/e2e/data/infrastructure-inmemory/main/clusterclass-in-memory.yaml b/test/e2e/data/infrastructure-inmemory/main/clusterclass-in-memory.yaml index 9064a6e254b2..516c85cba844 100644 --- 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,7 +99,24 @@ 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 @@ -91,7 +124,24 @@ 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 index 5bc343c271e2..1331fc653052 100644 --- 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 index 5449ebd14790..b908c8af212f 100644 --- 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,7 +99,24 @@ 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 @@ -91,7 +124,24 @@ 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