diff --git a/templates/test/ci/patches/kcp-node-deletion-timeout.yaml b/templates/test/ci/patches/kcp-node-deletion-timeout.yaml new file mode 100644 index 00000000000..0fd8225f5d7 --- /dev/null +++ b/templates/test/ci/patches/kcp-node-deletion-timeout.yaml @@ -0,0 +1,7 @@ +apiVersion: controlplane.cluster.x-k8s.io/v1beta1 +kind: KubeadmControlPlane +metadata: + name: ${CLUSTER_NAME}-control-plane +spec: + machineTemplate: + nodeDeletionTimeout: 600s diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml index dd4bd5233e9..766705dc9a2 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml @@ -239,6 +239,7 @@ spec: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: AzureMachineTemplate name: ${CLUSTER_NAME}-control-plane + nodeDeletionTimeout: 600s replicas: ${CONTROL_PLANE_MACHINE_COUNT} rolloutStrategy: rollingUpdate: diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in/kustomization.yaml index a3b9c1ce8df..afdca555212 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in/kustomization.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in/kustomization.yaml @@ -13,3 +13,4 @@ patches: - path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml - path: ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml - path: ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml +- path: ../../../../../../templates/test/ci/patches/kcp-node-deletion-timeout.yaml diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-upgrades.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-upgrades.yaml index 5103ca13882..2078ea97f69 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-upgrades.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-upgrades.yaml @@ -178,6 +178,7 @@ spec: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: AzureMachineTemplate name: ${CLUSTER_NAME}-control-plane + nodeDeletionTimeout: 600s replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-upgrades/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-upgrades/kustomization.yaml index 7bb4066f1cb..40c14d79481 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-upgrades/kustomization.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-upgrades/kustomization.yaml @@ -7,3 +7,4 @@ resources: - ../../../../../../templates/azure-cluster-identity/azure-cluster-identity.yaml patches: - path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml +- path: ../../../../../../templates/test/ci/patches/kcp-node-deletion-timeout.yaml