From 8294c0ed5ff52774415b4ea524c16c98d142d706 Mon Sep 17 00:00:00 2001
From: Christian Schlotter <christian.schlotter@broadcom.com>
Date: Fri, 14 Jun 2024 16:54:24 +0200
Subject: [PATCH] test: use rolloutStrategy to speed up K8s-Upgrade tests to
 not hit rollout timeout

---
 test/e2e/config/vsphere.yaml                               | 1 +
 .../main/install-on-bootstrap/kustomization.yaml           | 3 +++
 .../main/install-on-bootstrap/set-md-rollout-strategy.yaml | 7 +++++++
 .../main/install-on-bootstrap/kustomization.yaml           | 3 +++
 .../main/install-on-bootstrap/set-md-rollout-strategy.yaml | 7 +++++++
 5 files changed, 21 insertions(+)
 create mode 100644 test/e2e/data/infrastructure-vsphere-govmomi/main/install-on-bootstrap/set-md-rollout-strategy.yaml
 create mode 100644 test/e2e/data/infrastructure-vsphere-supervisor/main/install-on-bootstrap/set-md-rollout-strategy.yaml

diff --git a/test/e2e/config/vsphere.yaml b/test/e2e/config/vsphere.yaml
index 2aeb087684..e0a802c054 100644
--- a/test/e2e/config/vsphere.yaml
+++ b/test/e2e/config/vsphere.yaml
@@ -291,6 +291,7 @@ intervals:
   default/wait-worker-nodes: ["10m", "10s"]
   default/wait-delete-cluster: ["5m", "10s"]
   default/wait-machine-upgrade: ["15m", "1m"]
+  default/wait-nodes-ready: ["10m", "10s"]
   default/wait-machine-remediation: ["15m", "10s"]
   mhc-remediation/mhc-remediation: ["30m", "10s"]
   node-drain/wait-deployment-available: ["3m", "10s"]
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/install-on-bootstrap/kustomization.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/install-on-bootstrap/kustomization.yaml
index 1a90a2c199..6baeb19c74 100644
--- a/test/e2e/data/infrastructure-vsphere-govmomi/main/install-on-bootstrap/kustomization.yaml
+++ b/test/e2e/data/infrastructure-vsphere-govmomi/main/install-on-bootstrap/kustomization.yaml
@@ -6,3 +6,6 @@ patches:
   - target:
       kind: Cluster
     path: ./inject-install-on-bootstrap.yaml
+  - target:
+      kind: Cluster
+    path: ./set-md-rollout-strategy.yaml
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/install-on-bootstrap/set-md-rollout-strategy.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/install-on-bootstrap/set-md-rollout-strategy.yaml
new file mode 100644
index 0000000000..5bb8a8c01f
--- /dev/null
+++ b/test/e2e/data/infrastructure-vsphere-govmomi/main/install-on-bootstrap/set-md-rollout-strategy.yaml
@@ -0,0 +1,7 @@
+- op: add
+  path: /spec/topology/workers/machineDeployments/0/strategy
+  value:
+    rollingUpdate:
+      maxUnavailable: "100%"
+      maxSurge: "100%"
+    type: RollingUpdate
diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/install-on-bootstrap/kustomization.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/install-on-bootstrap/kustomization.yaml
index 1a90a2c199..6baeb19c74 100644
--- a/test/e2e/data/infrastructure-vsphere-supervisor/main/install-on-bootstrap/kustomization.yaml
+++ b/test/e2e/data/infrastructure-vsphere-supervisor/main/install-on-bootstrap/kustomization.yaml
@@ -6,3 +6,6 @@ patches:
   - target:
       kind: Cluster
     path: ./inject-install-on-bootstrap.yaml
+  - target:
+      kind: Cluster
+    path: ./set-md-rollout-strategy.yaml
diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/install-on-bootstrap/set-md-rollout-strategy.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/install-on-bootstrap/set-md-rollout-strategy.yaml
new file mode 100644
index 0000000000..5bb8a8c01f
--- /dev/null
+++ b/test/e2e/data/infrastructure-vsphere-supervisor/main/install-on-bootstrap/set-md-rollout-strategy.yaml
@@ -0,0 +1,7 @@
+- op: add
+  path: /spec/topology/workers/machineDeployments/0/strategy
+  value:
+    rollingUpdate:
+      maxUnavailable: "100%"
+      maxSurge: "100%"
+    type: RollingUpdate