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 37a49bad620..13c47e2a47c 100644 --- a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml +++ b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml @@ -1,8 +1,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: - labels: - azuredisk-csi: "true" name: ${CLUSTER_NAME} namespace: default spec: 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 31456436dba..d54e6ffcffa 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 @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico-dual-stack cni-windows: ${CLUSTER_NAME}-calico containerd-logger: disabled 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 96385aae564..42c8d17d3df 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico-ipv6 cni-windows: ${CLUSTER_NAME}-calico containerd-logger: disabled diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index ae08c4a8bad..1d6937e1a41 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml index c451a004063..9bc049eecf0 100644 --- a/templates/test/ci/cluster-template-prow-custom-vnet.yaml +++ b/templates/test/ci/cluster-template-prow-custom-vnet.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico name: ${CLUSTER_NAME} 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 6fc92a8c5b8..4600af93359 100644 --- a/templates/test/ci/cluster-template-prow-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-dual-stack.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico-dual-stack name: ${CLUSTER_NAME} namespace: default diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml index c2bb7641b71..34555412ade 100644 --- a/templates/test/ci/cluster-template-prow-edgezone.yaml +++ b/templates/test/ci/cluster-template-prow-edgezone.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico name: ${CLUSTER_NAME} namespace: default diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml index 531ca8811d8..ae815cd63b1 100644 --- a/templates/test/ci/cluster-template-prow-flatcar.yaml +++ b/templates/test/ci/cluster-template-prow-flatcar.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico name: ${CLUSTER_NAME} namespace: default 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 index bb28f25dd5f..6b55b902a71 100644 --- 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 @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled diff --git a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml index 3b878b6fc30..f440fdbd32d 100644 --- a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml +++ b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml index b605d5bca16..1491a80f717 100644 --- a/templates/test/ci/cluster-template-prow-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ipv6.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico-ipv6 name: ${CLUSTER_NAME} namespace: default 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 28a0adeaf40..873d770515a 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 @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled 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 f89925d6cf1..c34cae5bd57 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml index a307f111693..1685140b5d7 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml index e847170f181..3515ed2a321 100644 --- a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml +++ b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico name: ${CLUSTER_NAME} namespace: default diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml index 68825484f99..7e0f6673859 100644 --- a/templates/test/ci/cluster-template-prow-private.yaml +++ b/templates/test/ci/cluster-template-prow-private.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico name: ${CLUSTER_NAME} namespace: default diff --git a/templates/test/ci/cluster-template-prow-topology.yaml b/templates/test/ci/cluster-template-prow-topology.yaml index e858174cfd3..6ff4efa7a63 100644 --- a/templates/test/ci/cluster-template-prow-topology.yaml +++ b/templates/test/ci/cluster-template-prow-topology.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled diff --git a/templates/test/ci/cluster-template-prow-workload-identity.yaml b/templates/test/ci/cluster-template-prow-workload-identity.yaml index 690114d9439..81df52cc5cc 100644 --- a/templates/test/ci/cluster-template-prow-workload-identity.yaml +++ b/templates/test/ci/cluster-template-prow-workload-identity.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico name: ${CLUSTER_NAME} namespace: default diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml index f4eb3321d12..69e3b518020 100644 --- a/templates/test/ci/cluster-template-prow.yaml +++ b/templates/test/ci/cluster-template-prow.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled diff --git a/templates/test/ci/patches/cluster-label-azuredisk-csi-driver.yaml b/templates/test/ci/patches/cluster-label-azuredisk-csi-driver.yaml deleted file mode 100644 index 080f57937ff..00000000000 --- a/templates/test/ci/patches/cluster-label-azuredisk-csi-driver.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: cluster.x-k8s.io/v1beta1 -kind: Cluster -metadata: - name: ${CLUSTER_NAME} - labels: - azuredisk-csi: "true" \ No newline at end of file diff --git a/templates/test/ci/prow-azure-cni-v1/kustomization.yaml b/templates/test/ci/prow-azure-cni-v1/kustomization.yaml index fe00ee0a141..edc3ef31580 100644 --- 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 index 0565fdf4edf..3560a6b1671 100644 --- 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 index d123be7c0df..b3a9446fcd6 100644 --- 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 index e8a0aa31b58..b8305b908a1 100644 --- 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 index 60af393772e..2934efaafa3 100644 --- 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 index 93cb5cf349b..dc8be660a23 100644 --- 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 index 59822b47c4a..7d11304870f 100644 --- 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 index d96de0180ba..e9fbee8abb8 100644 --- 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 index a624b79ed55..a58c55dc527 100644 --- 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 \ No newline at end of file + note: generated diff --git a/templates/test/ci/prow-topology/kustomization.yaml b/templates/test/ci/prow-topology/kustomization.yaml index a5a4ebcc189..87ad2db29b2 100644 --- 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 index 642b67c258a..3859eae26a5 100644 --- 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 index 9eb60192826..ebb1c2ead07 100644 --- 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 index 6b6c1d39670..60eb557861e 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml index b3d14b3f63f..561da39f431 100644 --- a/templates/test/dev/cluster-template-custom-builds.yaml +++ b/templates/test/dev/cluster-template-custom-builds.yaml @@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: labels: - azuredisk-csi: "true" cni: calico cni-windows: ${CLUSTER_NAME}-calico containerd-logger: enabled diff --git a/test/e2e/cloud-provider-azure.go b/test/e2e/cloud-provider-azure.go index bbe391ecbc9..0267b2410b3 100644 --- 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 index 0fa61e9de02..0f7a2671000 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.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-kcp-remediation/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation/kustomization.yaml index 9e1f19137fe..dcedaf967eb 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation/kustomization.yaml +++ b/test/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 index 935150b76f2..ee4fc9001d2 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 @@ -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-kcp-scale-in/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in/kustomization.yaml index 52dd66fa093..9ff2ab9b255 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 @@ -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 index 6daa5f9f8e3..123305c40d2 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml @@ -75,7 +75,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-machine-pool/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool/kustomization.yaml index dce55fb18ad..47616e11714 100644 --- 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 index 474d5da56af..b7bfeb39d45 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.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-md-remediation/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation/kustomization.yaml index ed195fc0bd6..b8b5c7bf1d8 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation/kustomization.yaml +++ b/test/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 index d53f7bd1447..e030030394a 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.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-node-drain/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain/kustomization.yaml index c292b89295f..068b84ec7db 100644 --- 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 index e776ae8974f..7c626fc4c3b 100644 --- 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 index 31346933340..12b0a40d8fa 100644 --- 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 deleted file mode 100644 index 080f57937ff..00000000000 --- a/test/e2e/data/infrastructure-azure/v1beta1/patches/cluster-label-azuredisk-csi-driver.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: cluster.x-k8s.io/v1beta1 -kind: Cluster -metadata: - name: ${CLUSTER_NAME} - labels: - azuredisk-csi: "true" \ No newline at end of file