azure: Enable tests for Azure Disk CSI Driver

hakman · hakman · commit 99c9b542dde1 · 2026-04-01T14:42:22.000+03:00
Signed-off-by: Ciprian Hacman &lt;ciprian@hakman.dev&gt;
diff --git a/tests/e2e/csi-manifests/azure-disk/driver.yaml b/tests/e2e/csi-manifests/azure-disk/driver.yaml
@@ -0,0 +1,30 @@
+# Manifest for Kubernetes external tests.
+# See https://github.com/kubernetes/kubernetes/tree/master/test/e2e/storage/external
+# https://github.com/kubernetes-sigs/azuredisk-csi-driver/blob/master/test/external-e2e/manifest/testdriver.yaml
+
+StorageClass:
+  FromFile: tests/e2e/csi-manifests/azure-disk/sc.yaml
+DriverInfo:
+  Name: disk.csi.azure.com
+  SupportedSizeRange:
+    Min: 1Gi
+  SupportedFsType:
+    ext4: {}
+    ext3: {}
+    xfs: {}
+  Capabilities:
+    persistence: true
+    fsGroup: true
+    block: true
+    exec: true
+    multipods: true
+    controllerExpansion: true
+    nodeExpansion: true
+    onlineExpansion: true
+    volumeLimits: true
+    singleNodeVolume: true
+    topology: true
+    snapshotDataSource: false
+    pvcDataSource: false
+    RWX: false
+    readWriteOncePod: true
diff --git a/tests/e2e/csi-manifests/azure-disk/sc.yaml b/tests/e2e/csi-manifests/azure-disk/sc.yaml
@@ -0,0 +1,10 @@
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: managed-csi
+provisioner: disk.csi.azure.com
+allowVolumeExpansion: true
+parameters:
+  skuName: StandardSSD_LRS
+reclaimPolicy: Delete
+volumeBindingMode: WaitForFirstConsumer
diff --git a/tests/e2e/csi-manifests/manifests.go b/tests/e2e/csi-manifests/manifests.go
@@ -18,5 +18,5 @@ package csimanifests
 
 import "embed"
 
-//go:embed aws-ebs/* gcp-pd/* dobs/*
+//go:embed aws-ebs/* azure-disk/* dobs/* gcp-pd/*
 var FS embed.FS
diff --git a/tests/e2e/pkg/tester/skip_regex.go b/tests/e2e/pkg/tester/skip_regex.go
@@ -102,6 +102,18 @@ func (t *Tester) setSkipRegexFlag() error {
 		skipRegex += "|Services.should.respect.internalTrafficPolicy=Local.Pod.and.Node,.to.Pod"
 	}
 
+	if cluster.Spec.LegacyCloudProvider == "azure" {
+		// The Azure File CSI driver is not yet deployed by kOps, so all in-tree azure-file tests fail
+		// because CSI migration expects file.csi.azure.com to be present.
+		skipRegex += "|In-tree.Volumes.\\[Driver:.azure-file\\]"
+		// The in-tree azure-disk topology tests use the deprecated failure-domain.beta.kubernetes.io/zone label
+		// which is no longer present on nodes.
+		skipRegex += "|In-tree.Volumes.\\[Driver:.azure-disk\\].*topology"
+		// kOps does not yet deploy the full Azure cloud-controller-manager (only cloud-node-manager),
+		// so the service controller for LoadBalancer provisioning is not available.
+		skipRegex += "|should.not.disrupt.a.cloud.load-balancer"
+	}
+
 	if cluster.Spec.LegacyCloudProvider == "gce" {
 		// this test assumes the cluster runs COS but kOps uses Ubuntu by default
 		// ref: https://github.com/kubernetes/test-infra/pull/22190
diff --git a/tests/e2e/pkg/tester/tester.go b/tests/e2e/pkg/tester/tester.go
@@ -150,10 +150,8 @@ func (t *Tester) addProviderFlag() error {
 
 	provider := ""
 	switch cluster.Spec.LegacyCloudProvider {
-	case "aws", "gce":
+	case "aws", "azure", "gce":
 		provider = cluster.Spec.LegacyCloudProvider
-	case "azure":
-		// TODO: Enable when Azure Disk and FIle CSI drivers are added
 	case "digitalocean":
 	default:
 		klog.Warningf("unhandled cluster.spec.cloudProvider %q for determining ginkgo Provider", cluster.Spec.LegacyCloudProvider)
@@ -437,6 +435,9 @@ func (t *Tester) addCSIDriverFlags() error {
 		*cluster.Spec.CloudConfig.GCPPDCSIDriver.Enabled:
 		provider = "gcp-pd"
 		migratedPlugin = "kubernetes.io/gce-pd"
+	case cluster.Spec.LegacyCloudProvider == "azure":
+		provider = "azure-disk"
+		migratedPlugin = "kubernetes.io/azure-disk"
 	case cluster.Spec.LegacyCloudProvider == "digitalocean":
 		provider = "dobs"
 	}
