diff --git a/templates/test/ci/cluster-template-prow-apiserver-ilb.yaml b/templates/test/ci/cluster-template-prow-apiserver-ilb.yaml index c5c40803ee7..c0bd6bd85eb 100644 --- a/templates/test/ci/cluster-template-prow-apiserver-ilb.yaml +++ b/templates/test/ci/cluster-template-prow-apiserver-ilb.yaml @@ -231,6 +231,25 @@ spec: tenantID: ${AZURE_TENANT_ID} type: ${CLUSTER_IDENTITY_TYPE:=WorkloadIdentity} --- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy metadata: diff --git a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml index 93ad38109b2..d512f1c6ba3 100644 --- a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml +++ b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml @@ -220,6 +220,25 @@ spec: tenantID: ${AZURE_TENANT_ID} type: ${CLUSTER_IDENTITY_TYPE:=WorkloadIdentity} --- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- apiVersion: addons.cluster.x-k8s.io/v1alpha1 kind: HelmChartProxy metadata: diff --git a/templates/test/ci/cluster-template-prow-ci-version-dra.yaml b/templates/test/ci/cluster-template-prow-ci-version-dra.yaml index b833f77762e..da5b5683b6a 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-dra.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-dra.yaml @@ -617,6 +617,25 @@ spec: sshAuthorizedKeys: - ${AZURE_SSH_PUBLIC_KEY:=""} --- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- apiVersion: addons.cluster.x-k8s.io/v1beta1 kind: ClusterResourceSet metadata: diff --git a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml index bcaa7ab0107..204a1b4ab7d 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml @@ -455,6 +455,25 @@ spec: --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck metadata: name: ${CLUSTER_NAME}-mhc-0 namespace: default diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml index 0c987bdd2ae..c83ac472d3b 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml @@ -473,6 +473,25 @@ spec: --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck metadata: name: ${CLUSTER_NAME}-mhc-0 namespace: default diff --git a/templates/test/ci/cluster-template-prow-ci-version-md-and-mp.yaml b/templates/test/ci/cluster-template-prow-ci-version-md-and-mp.yaml index 8993206fb6d..e5fd45b1df1 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-md-and-mp.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-md-and-mp.yaml @@ -619,6 +619,25 @@ spec: --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck metadata: name: ${CLUSTER_NAME}-mhc-0 namespace: default diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index f5e19a03505..1beb16a1468 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -619,6 +619,25 @@ spec: --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck metadata: name: ${CLUSTER_NAME}-mhc-0 namespace: default diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml index 6b7b042d4d9..4150d9fde82 100644 --- a/templates/test/ci/cluster-template-prow-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-dual-stack.yaml @@ -240,6 +240,25 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' --- apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 kind: MachinePool metadata: name: ${CLUSTER_NAME}-mp-0 diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml index 8db7684b78f..ed0bad8f71a 100644 --- a/templates/test/ci/cluster-template-prow-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ipv6.yaml @@ -255,6 +255,25 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' --- apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 kind: MachinePool metadata: name: ${CLUSTER_NAME}-mp-0 diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml index a1cdaf76381..e0e58662f97 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml @@ -577,6 +577,25 @@ spec: sshAuthorizedKeys: - ${AZURE_SSH_PUBLIC_KEY:=""} --- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- apiVersion: addons.cluster.x-k8s.io/v1beta1 kind: ClusterResourceSet metadata: diff --git a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml index 54436cdb8cb..5b0eabd15ea 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml @@ -310,6 +310,25 @@ spec: sshAuthorizedKeys: - ${AZURE_SSH_PUBLIC_KEY:=""} --- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- apiVersion: addons.cluster.x-k8s.io/v1beta1 kind: ClusterResourceSet metadata: diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml index 57c40970f5d..bd3451250e6 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool.yaml @@ -304,6 +304,25 @@ spec: sshAuthorizedKeys: - ${AZURE_SSH_PUBLIC_KEY:=""} --- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- apiVersion: addons.cluster.x-k8s.io/v1beta1 kind: ClusterResourceSet metadata: diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml index 6bd9bcef9a8..accac0e5b4e 100644 --- a/templates/test/ci/cluster-template-prow.yaml +++ b/templates/test/ci/cluster-template-prow.yaml @@ -351,6 +351,25 @@ spec: --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck metadata: name: ${CLUSTER_NAME}-mhc-0 namespace: default diff --git a/templates/test/ci/prow-apiserver-ilb/kustomization.yaml b/templates/test/ci/prow-apiserver-ilb/kustomization.yaml index 8bdb920e38f..d7919bdf6bb 100644 --- a/templates/test/ci/prow-apiserver-ilb/kustomization.yaml +++ b/templates/test/ci/prow-apiserver-ilb/kustomization.yaml @@ -3,6 +3,7 @@ kind: Kustomization namespace: default resources: - ../../../flavors/apiserver-ilb + - ../prow/mhc-kubeadmcontrolplane.yaml - ../../../addons/cluster-api-helm/calico.yaml - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml - ../../../addons/cluster-api-helm/cloud-provider-azure.yaml diff --git a/templates/test/ci/prow-azure-cni-v1/kustomization.yaml b/templates/test/ci/prow-azure-cni-v1/kustomization.yaml index dc4ed86c474..7fc9f287cf1 100644 --- a/templates/test/ci/prow-azure-cni-v1/kustomization.yaml +++ b/templates/test/ci/prow-azure-cni-v1/kustomization.yaml @@ -3,6 +3,7 @@ kind: Kustomization namespace: default resources: - ../../../flavors/azure-cni-v1/ +- ../prow/mhc-kubeadmcontrolplane.yaml - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml - ../../../addons/cluster-api-helm/cloud-provider-azure.yaml - ../../../addons/cluster-api-helm/cloud-provider-azure-ci.yaml diff --git a/templates/test/ci/prow-dual-stack/kustomization.yaml b/templates/test/ci/prow-dual-stack/kustomization.yaml index 937035df106..814831f18a2 100644 --- a/templates/test/ci/prow-dual-stack/kustomization.yaml +++ b/templates/test/ci/prow-dual-stack/kustomization.yaml @@ -3,6 +3,7 @@ kind: Kustomization namespace: default resources: - ../../../flavors/dual-stack +- ../prow/mhc-kubeadmcontrolplane.yaml - machine-pool-dualstack.yaml - ../../../addons/cluster-api-helm/calico-dual-stack.yaml - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml diff --git a/templates/test/ci/prow-ipv6/kustomization.yaml b/templates/test/ci/prow-ipv6/kustomization.yaml index a50275b7437..14cfbce9324 100644 --- a/templates/test/ci/prow-ipv6/kustomization.yaml +++ b/templates/test/ci/prow-ipv6/kustomization.yaml @@ -3,6 +3,7 @@ kind: Kustomization namespace: default resources: - ../../../flavors/ipv6 +- ../prow/mhc-kubeadmcontrolplane.yaml - machine-pool-ipv6.yaml - ../../../addons/cluster-api-helm/calico-ipv6.yaml - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml diff --git a/templates/test/ci/prow-machine-pool/kustomization.yaml b/templates/test/ci/prow-machine-pool/kustomization.yaml index e17c01a3424..ef9c627a4c0 100644 --- a/templates/test/ci/prow-machine-pool/kustomization.yaml +++ b/templates/test/ci/prow-machine-pool/kustomization.yaml @@ -3,6 +3,7 @@ kind: Kustomization namespace: default resources: - ../../../flavors/machinepool-windows +- ../prow/mhc-kubeadmcontrolplane.yaml - ../prow/cni-resource-set.yaml - ../../../addons/windows/csi-proxy/csi-proxy-resource-set.yaml - ../../../addons/windows/containerd-logging/containerd-logger-resource-set.yaml diff --git a/templates/test/ci/prow/kustomization.yaml b/templates/test/ci/prow/kustomization.yaml index 8dbf5019f38..81f7b28fb41 100644 --- a/templates/test/ci/prow/kustomization.yaml +++ b/templates/test/ci/prow/kustomization.yaml @@ -5,6 +5,7 @@ resources: - ../../../flavors/base - ../../../flavors/default/machine-deployment.yaml - ../../../flavors/windows/machine-deployment-windows.yaml +- mhc-kubeadmcontrolplane.yaml - mhc.yaml - cni-resource-set.yaml - ../../../azure-cluster-identity diff --git a/templates/test/ci/prow/mhc-kubeadmcontrolplane.yaml b/templates/test/ci/prow/mhc-kubeadmcontrolplane.yaml new file mode 100644 index 00000000000..97b7d7a2c06 --- /dev/null +++ b/templates/test/ci/prow/mhc-kubeadmcontrolplane.yaml @@ -0,0 +1,18 @@ +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck +metadata: + name: "${CLUSTER_NAME}-control-plane" +spec: + clusterName: "${CLUSTER_NAME}" + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - type: Ready + status: Unknown + timeout: 300s + - type: Ready + status: "False" + timeout: 300s diff --git a/templates/test/dev/cluster-template-custom-builds-dra.yaml b/templates/test/dev/cluster-template-custom-builds-dra.yaml index 827495f2733..485f3154fe6 100644 --- a/templates/test/dev/cluster-template-custom-builds-dra.yaml +++ b/templates/test/dev/cluster-template-custom-builds-dra.yaml @@ -571,6 +571,25 @@ spec: sshAuthorizedKeys: - ${AZURE_SSH_PUBLIC_KEY:=""} --- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- apiVersion: addons.cluster.x-k8s.io/v1beta1 kind: ClusterResourceSet metadata: diff --git a/templates/test/dev/cluster-template-custom-builds-load-dra.yaml b/templates/test/dev/cluster-template-custom-builds-load-dra.yaml index 02d439fa6bd..228ed5ff416 100644 --- a/templates/test/dev/cluster-template-custom-builds-load-dra.yaml +++ b/templates/test/dev/cluster-template-custom-builds-load-dra.yaml @@ -627,6 +627,25 @@ spec: --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck metadata: name: ${CLUSTER_NAME}-mhc-0 namespace: default diff --git a/templates/test/dev/cluster-template-custom-builds-load.yaml b/templates/test/dev/cluster-template-custom-builds-load.yaml index 5a0c067dd1f..395684934ca 100644 --- a/templates/test/dev/cluster-template-custom-builds-load.yaml +++ b/templates/test/dev/cluster-template-custom-builds-load.yaml @@ -591,6 +591,25 @@ spec: --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck metadata: name: ${CLUSTER_NAME}-mhc-0 namespace: default diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml index a7f602c52a0..9515e8c793f 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml @@ -531,6 +531,25 @@ spec: sshAuthorizedKeys: - ${AZURE_SSH_PUBLIC_KEY:=""} --- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- apiVersion: addons.cluster.x-k8s.io/v1beta1 kind: ClusterResourceSet metadata: diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml index 76032461c2e..ce28a071f53 100644 --- a/templates/test/dev/cluster-template-custom-builds.yaml +++ b/templates/test/dev/cluster-template-custom-builds.yaml @@ -585,6 +585,25 @@ spec: --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck metadata: name: ${CLUSTER_NAME}-mhc-0 namespace: default diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml index b209f04be0b..da27d23607a 100644 --- a/test/e2e/config/azure-dev.yaml +++ b/test/e2e/config/azure-dev.yaml @@ -258,7 +258,7 @@ intervals: default/wait-private-cluster: ["30m", "10s"] default/wait-control-plane: ["20m", "10s"] default/wait-control-plane-long: ["40m", "10s"] - default/wait-control-plane-ha: ["30m", "10s"] + default/wait-control-plane-ha: ["60m", "10s"] default/wait-worker-nodes: ["25m", "10s"] default/wait-gpu-nodes: ["30m", "10s"] default/wait-nodes-ready: ["10m", "10s"] diff --git a/test/e2e/data/infrastructure-azure/v1.18.5/cluster-template-prow-machine-and-machine-pool.yaml b/test/e2e/data/infrastructure-azure/v1.18.5/cluster-template-prow-machine-and-machine-pool.yaml index adae2255963..3429f5b6609 100644 --- a/test/e2e/data/infrastructure-azure/v1.18.5/cluster-template-prow-machine-and-machine-pool.yaml +++ b/test/e2e/data/infrastructure-azure/v1.18.5/cluster-template-prow-machine-and-machine-pool.yaml @@ -401,6 +401,25 @@ spec: --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck metadata: name: ${CLUSTER_NAME}-mhc-0 namespace: default diff --git a/test/e2e/data/infrastructure-azure/v1.18.5/cluster-template-prow.yaml b/test/e2e/data/infrastructure-azure/v1.18.5/cluster-template-prow.yaml index 7dbb685a7fc..4d12f772869 100644 --- a/test/e2e/data/infrastructure-azure/v1.18.5/cluster-template-prow.yaml +++ b/test/e2e/data/infrastructure-azure/v1.18.5/cluster-template-prow.yaml @@ -343,6 +343,25 @@ spec: --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck metadata: name: ${CLUSTER_NAME}-mhc-0 namespace: default diff --git a/test/e2e/data/infrastructure-azure/v1.19.4/cluster-template-prow-machine-and-machine-pool.yaml b/test/e2e/data/infrastructure-azure/v1.19.4/cluster-template-prow-machine-and-machine-pool.yaml index adae2255963..3429f5b6609 100644 --- a/test/e2e/data/infrastructure-azure/v1.19.4/cluster-template-prow-machine-and-machine-pool.yaml +++ b/test/e2e/data/infrastructure-azure/v1.19.4/cluster-template-prow-machine-and-machine-pool.yaml @@ -401,6 +401,25 @@ spec: --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck metadata: name: ${CLUSTER_NAME}-mhc-0 namespace: default diff --git a/test/e2e/data/infrastructure-azure/v1.19.4/cluster-template-prow.yaml b/test/e2e/data/infrastructure-azure/v1.19.4/cluster-template-prow.yaml index 7dbb685a7fc..4d12f772869 100644 --- a/test/e2e/data/infrastructure-azure/v1.19.4/cluster-template-prow.yaml +++ b/test/e2e/data/infrastructure-azure/v1.19.4/cluster-template-prow.yaml @@ -343,6 +343,25 @@ spec: --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineHealthCheck +metadata: + name: ${CLUSTER_NAME}-control-plane + namespace: default +spec: + clusterName: ${CLUSTER_NAME} + maxUnhealthy: 100% + selector: + matchLabels: + cluster.x-k8s.io/control-plane: "" + unhealthyConditions: + - status: Unknown + timeout: 300s + type: Ready + - status: "False" + timeout: 300s + type: Ready +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineHealthCheck metadata: name: ${CLUSTER_NAME}-mhc-0 namespace: default