PVS e2e related changes (#1072)

Signed-off-by: Prajyot-Parab <[email protected]>

Author: Prajyot-Parab

scripts/ci-e2e.sh

@@ -39,7 +39,7 @@ OS=$(uname -s)
 IBMCLOUD_CLI_VERSION=${IBMCLOUD_CLI_VERSION:-"2.13.0"}
 PVSADM_VERSION=${PVSADM_VERSION:-"v0.1.9"}
 E2E_FLAVOR=${E2E_FLAVOR:-}
-REGION=${REGION:-"us-south"}
+REGION=${REGION:-"jp-osa"}
 
 [ "${ARCH}" == "x86_64" ] && ARCH="amd64"
 

templates/cluster-template-powervs.yaml

@@ -216,7 +216,6 @@ kind: KubeadmConfigTemplate
 metadata:
   labels:
     cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
-    cluster.x-k8s.io/control-plane: ""
   name: "${CLUSTER_NAME}-md-0"
 spec:
   template:

test/e2e/config/ibmcloud-e2e-powervs.yaml

@@ -60,8 +60,8 @@ variables:
 intervals:
   default/wait-controllers: ["3m", "10s"]
   default/wait-cluster: ["20m", "10s"]
-  default/wait-control-plane: ["30m", "10s"]
-  default/wait-worker-nodes: ["30m", "10s"]
+  default/wait-control-plane: ["60m", "10s"]
+  default/wait-worker-nodes: ["60m", "10s"]
   default/wait-delete-cluster: ["20m", "10s"]
   default/wait-machine-upgrade: ["50m", "10s"]
   default/wait-machine-remediation: ["30m", "10s"]

test/e2e/data/templates/cluster-template-powervs-md-remediation/kustomization.yaml

@@ -2,4 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../../../../templates/cluster-template-powervs.yaml
-  - mhc-powervs.yaml
+  - mhc-md-powervs.yaml
+  - mhc-kcp-powervs.yaml
+patchesStrategicMerge:
+  - patches/mhc-label.yaml

test/e2e/data/templates/cluster-template-powervs-md-remediation/mhc-kcp-powervs.yaml

@@ -0,0 +1,18 @@
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: MachineHealthCheck
+metadata:
+  name: "${CLUSTER_NAME}-mhc-kcp"
+spec:
+  clusterName: "${CLUSTER_NAME}"
+  maxUnhealthy: 100%
+  nodeStartupTimeout: 0m
+  selector:
+    matchLabels:
+      cluster.x-k8s.io/control-plane: ""
+  unhealthyConditions:
+    - type: Ready
+      status: "False"
+      timeout: 60s
+    - type: Ready
+      status: Unknown
+      timeout: 60s

…-powervs-md-remediation/mhc-powervs.yaml …wervs-md-remediation/mhc-md-powervs.yamltest/e2e/data/templates/cluster-template-powervs-md-remediation/mhc-powervs.yaml renamed to test/e2e/data/templates/cluster-template-powervs-md-remediation/mhc-md-powervs.yaml test/e2e/data/templates/cluster-template-powervs-md-remediation/mhc-powervs.yaml renamed to test/e2e/data/templates/cluster-template-powervs-md-remediation/mhc-md-powervs.yaml

@@ -1,7 +1,7 @@
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineHealthCheck
 metadata:
-  name: "${CLUSTER_NAME}-mhc-0"
+  name: "${CLUSTER_NAME}-mhc-md"
 spec:
   clusterName: "${CLUSTER_NAME}"
   maxUnhealthy: 100%
@@ -12,4 +12,7 @@ spec:
   unhealthyConditions:
     - type: Ready
       status: "False"
-      timeout: 30s
+      timeout: 60s
+    - type: Ready
+      status: Unknown
+      timeout: 60s

test/e2e/data/templates/cluster-template-powervs-md-remediation/patches/mhc-label.yaml

@@ -0,0 +1,12 @@
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: MachineDeployment
+metadata:
+  name: "${CLUSTER_NAME}-md-0"
+spec:
+  selector:
+    matchLabels:
+  template:
+    metadata:
+      labels:
+        "e2e.remediation.label": ""