label Cluster for azuredisk-csi HelmChartProxy at E2E runtime

Signed-off-by: Jack Francis <[email protected]>
kubernetes-sigs · Dec 5, 2023 · a9b8215 · a9b8215
1 parent 29bff3d
commit a9b8215
Show file tree

Hide file tree

Showing 48 changed files with 22 additions and 60 deletions.
diff --git a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml
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
diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml
diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml
diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml
diff --git a/templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml b/templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml
diff --git a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml
diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml
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
diff --git a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml
diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml
diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml
diff --git a/templates/test/ci/cluster-template-prow-topology.yaml b/templates/test/ci/cluster-template-prow-topology.yaml
diff --git a/templates/test/ci/cluster-template-prow-workload-identity.yaml b/templates/test/ci/cluster-template-prow-workload-identity.yaml
diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml
diff --git a/templates/test/ci/patches/cluster-label-azuredisk-csi-driver.yaml b/templates/test/ci/patches/cluster-label-azuredisk-csi-driver.yaml
diff --git a/templates/test/ci/prow-azure-cni-v1/kustomization.yaml b/templates/test/ci/prow-azure-cni-v1/kustomization.yaml
@@ -7,4 +7,3 @@ resources:
 patchesStrategicMerge:
   - ../patches/tags.yaml
   - ../patches/controller-manager.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
diff --git a/templates/test/ci/prow-custom-vnet/kustomization.yaml b/templates/test/ci/prow-custom-vnet/kustomization.yaml
@@ -14,4 +14,3 @@ patchesStrategicMerge:
   - ../patches/uami-md-0.yaml
   - ../patches/uami-control-plane.yaml
   - ../patches/cluster-label-calico.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
diff --git a/templates/test/ci/prow-dual-stack/kustomization.yaml b/templates/test/ci/prow-dual-stack/kustomization.yaml
@@ -12,4 +12,3 @@ patchesStrategicMerge:
   - patches/azure-machine-template-control-plane.yaml
   - patches/azure-machine-template.yaml
   - patches/cluster-label-calico-dual-stack.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
diff --git a/templates/test/ci/prow-edgezone/kustomization.yaml b/templates/test/ci/prow-edgezone/kustomization.yaml
@@ -16,4 +16,3 @@ patchesStrategicMerge:
   - patches/machine-type.yaml
   - patches/kubernetes-version.yaml
   - ../patches/cluster-label-calico.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
diff --git a/templates/test/ci/prow-flatcar/kustomization.yaml b/templates/test/ci/prow-flatcar/kustomization.yaml
@@ -9,4 +9,3 @@ patchesStrategicMerge:
   - ../patches/tags.yaml
   - ../patches/controller-manager.yaml
   - ../patches/cluster-label-calico.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
diff --git a/templates/test/ci/prow-ipv6/kustomization.yaml b/templates/test/ci/prow-ipv6/kustomization.yaml
@@ -10,5 +10,3 @@ patchesStrategicMerge:
   - ../patches/tags.yaml
   - ../patches/controller-manager.yaml
   - patches/cluster-label-calico-ipv6.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
-
diff --git a/templates/test/ci/prow-machine-pool/kustomization.yaml b/templates/test/ci/prow-machine-pool/kustomization.yaml
@@ -15,7 +15,6 @@ patchesStrategicMerge:
   - ../patches/machine-pool-worker-counts.yaml
   - ../patches/windows-containerd-labels.yaml
   - ../patches/cluster-label-calico.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
 configMapGenerator:
   - name: cni-${CLUSTER_NAME}-calico-windows
     files:

diff --git a/templates/test/ci/prow-nvidia-gpu/kustomization.yaml b/templates/test/ci/prow-nvidia-gpu/kustomization.yaml
@@ -10,7 +10,6 @@ patchesStrategicMerge:
   - ../patches/controller-manager.yaml
   - ../patches/azurecluster-gpu.yaml
   - ../patches/cluster-label-calico.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
 patches:
 - path: patches/node-storage-type.yaml
   target:

diff --git a/templates/test/ci/prow-private/kustomization.yaml b/templates/test/ci/prow-private/kustomization.yaml
@@ -16,7 +16,6 @@ patchesStrategicMerge:
   - ../prow-intree-cloud-provider/patches/intree-cp.yaml # TODO: remove once CAPI supports Helm addons
   - ../prow-intree-cloud-provider/patches/intree-md-0.yaml # TODO: remove once CAPI supports Helm addons
   - ../patches/cluster-label-calico.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
 patches:
   - path: patches/user-assigned.yaml
     target:
@@ -30,4 +29,4 @@ generatorOptions:
   labels:
     type: generated
   annotations:
-    note: generated
+    note: generated
diff --git a/templates/test/ci/prow-topology/kustomization.yaml b/templates/test/ci/prow-topology/kustomization.yaml
@@ -11,7 +11,6 @@ patchesStrategicMerge:
   - ../patches/windows-containerd-labels.yaml
   - cluster.yaml
   - ../patches/cluster-label-calico.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
 configMapGenerator:
   - name: cni-${CLUSTER_NAME}-calico-windows
     files:

diff --git a/templates/test/ci/prow-workload-identity/kustomization.yaml b/templates/test/ci/prow-workload-identity/kustomization.yaml
@@ -13,4 +13,3 @@ patchesStrategicMerge:
   - ../patches/uami-md-0.yaml
   - ../patches/uami-control-plane.yaml
   - ../patches/cluster-label-calico.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
diff --git a/templates/test/ci/prow/kustomization.yaml b/templates/test/ci/prow/kustomization.yaml
@@ -23,7 +23,6 @@ patchesStrategicMerge:
   - ../patches/windows-containerd-labels.yaml
   - ../patches/windows-server-version.yaml
   - ../patches/cluster-label-calico.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
 patches:
 - target:
     group: bootstrap.cluster.x-k8s.io

diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml
diff --git a/test/e2e/cloud-provider-azure.go b/test/e2e/cloud-provider-azure.go
@@ -26,6 +26,9 @@ import (
 	"strings"
 
 	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	"k8s.io/apimachinery/pkg/types"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
 )
 
@@ -36,6 +39,7 @@ const (
 	azureDiskCSIDriverHelmRepoURL     = "https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts"
 	azureDiskCSIDriverChartName       = "azuredisk-csi-driver"
 	azureDiskCSIDriverHelmReleaseName = "azuredisk-csi-driver-oot"
+	azureDiskCSIDriverCAAPHLabelName  = "azuredisk-csi"
 )
 
 // InstallCNIAndCloudProviderAzureHelmChart installs the official cloud-provider-azure helm chart
@@ -81,6 +85,7 @@ func InstallCNIAndCloudProviderAzureHelmChart(ctx context.Context, input cluster
 func EnsureAzureDiskCSIDriverHelmChart(ctx context.Context, input clusterctl.ApplyCustomClusterTemplateAndWaitInput, installHelmChart bool, hasWindows bool) {
 	specName := "ensure-azuredisk-csi-drivers"
 	clusterProxy := input.ClusterProxy.GetWorkloadCluster(ctx, input.Namespace, input.ClusterName)
+	mgmtClient := input.ClusterProxy.GetClient()
 
 	if installHelmChart {
 		By("Installing azure-disk CSI driver components via helm")
@@ -94,6 +99,22 @@ func EnsureAzureDiskCSIDriverHelmChart(ctx context.Context, input clusterctl.App
 		InstallHelmChart(ctx, clusterProxy, kubesystem, azureDiskCSIDriverHelmRepoURL, azureDiskCSIDriverChartName, azureDiskCSIDriverHelmReleaseName, options, os.Getenv(AzureDiskCSIDriverVersion))
 	} else {
 		By("Ensuring azure-disk CSI driver is installed via CAAPH")
+		cluster := &clusterv1.Cluster{}
+		Eventually(func(g Gomega) {
+			g.Expect(mgmtClient.Get(ctx, types.NamespacedName{
+				Namespace: input.Namespace,
+				Name:      input.ClusterName,
+			}, cluster)).To(Succeed())
+			// Label the cluster so that CAAPH installs the azuredisk-csi helm chart via existing HelmChartProxy resource
+			if cluster.Labels != nil {
+				cluster.Labels[azureDiskCSIDriverCAAPHLabelName] = "true"
+			} else {
+				cluster.Labels = map[string]string{
+					azureDiskCSIDriverCAAPHLabelName: "true",
+				}
+			}
+			g.Expect(mgmtClient.Update(ctx, cluster)).To(Succeed())
+		}, e2eConfig.GetIntervals(specName, "wait-deployment")...).Should(Succeed())
 	}
 
 	By("Waiting for Ready csi-azuredisk-controller deployment pods")

diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml
diff --git a/...e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation/kustomization.yaml b/...e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation/kustomization.yaml
@@ -9,4 +9,3 @@ bases:
 patchesStrategicMerge:
   - ../patches/azurecluster-identity-ref.yaml
   - ../patches/cluster-label-calico.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
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
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
@@ -9,4 +9,3 @@ patchesStrategicMerge:
 - ./cluster-with-kcp.yaml
 - ../patches/azurecluster-identity-ref.yaml
 - ../patches/cluster-label-calico.yaml
-- ../patches/cluster-label-azuredisk-csi-driver.yaml
diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml
diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool/kustomization.yaml
@@ -8,4 +8,3 @@ resources:
 patchesStrategicMerge:
   - ../patches/azurecluster-identity-ref.yaml
   - ../patches/cluster-label-calico.yaml
-  - ../patches/cluster-label-azuredisk-csi-driver.yaml
diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml
diff --git a/.../e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation/kustomization.yaml b/.../e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation/kustomization.yaml
@@ -10,4 +10,3 @@ patchesStrategicMerge:
 - ./md.yaml
 - ../patches/azurecluster-identity-ref.yaml
 - ../patches/cluster-label-calico.yaml
-- ../patches/cluster-label-azuredisk-csi-driver.yaml
diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml
diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain/kustomization.yaml
@@ -10,4 +10,3 @@ patchesStrategicMerge:
 - ./cluster-with-kcp.yaml
 - ../patches/azurecluster-identity-ref.yaml
 - ../patches/cluster-label-calico.yaml
-- ../patches/cluster-label-azuredisk-csi-driver.yaml
diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml
@@ -76,7 +76,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    azuredisk-csi: "true"
     cni: calico
   name: ${CLUSTER_NAME}
   namespace: default

diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template/kustomization.yaml
@@ -8,4 +8,3 @@ bases:
 patchesStrategicMerge:
 - ../patches/azurecluster-identity-ref.yaml
 - ../patches/cluster-label-calico.yaml
-- ../patches/cluster-label-azuredisk-csi-driver.yaml
diff --git a/test/e2e/data/infrastructure-azure/v1beta1/patches/cluster-label-azuredisk-csi-driver.yaml b/test/e2e/data/infrastructure-azure/v1beta1/patches/cluster-label-azuredisk-csi-driver.yaml