Merge pull request #18131 from rifelpet/do-csi-e2e

do: Upgrade CSI and enable E2E

Author: k8s-ci-robot

tests/e2e/csi-manifests/dobs/driver.yaml

@@ -0,0 +1,33 @@
+# Manifest for Kubernetes external tests.
+# See https://github.com/kubernetes/kubernetes/tree/master/test/e2e/storage/external
+# https://github.com/digitalocean/csi-digitalocean/blob/master/test/e2e/testdrivers/1.35.yaml
+StorageClass:
+  FromFile: tests/e2e/csi-manifests/dobs/sc.yaml
+SnapshotClass:
+  FromName: true
+DriverInfo:
+  Name: dobs.csi.digitalocean.com
+  SupportedSizeRange:
+    Max: 100Gi
+    Min: 1Gi
+  Capabilities:
+    persistence: true
+    block: true
+    fsGroup: true
+    volumeMountGroup: false
+    exec: true
+    snapshotDataSource: true
+    pvcDataSource: false
+    multipods: true
+    RWX: false
+    controllerExpansion: true
+    nodeExpansion: true
+    onlineExpansion: true
+    volumeLimits: true
+    singleNodeVolume: true
+    topology: true
+    capacity: false
+  SupportedFsType:
+    ext3:
+    ext4:
+    xfs:

tests/e2e/csi-manifests/dobs/sc.yaml

@@ -0,0 +1,8 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: do-block-storage
+allowVolumeExpansion: true
+provisioner: dobs.csi.digitalocean.com
+reclaimPolicy: Delete
+volumeBindingMode: Immediate

tests/e2e/csi-manifests/manifests.go

@@ -18,5 +18,5 @@ package csimanifests
 
 import "embed"
 
-//go:embed aws-ebs/* gcp-pd/*
+//go:embed aws-ebs/* gcp-pd/* dobs/*
 var FS embed.FS

tests/e2e/pkg/tester/tester.go

@@ -424,19 +424,21 @@ func (t *Tester) addCSIDriverFlags() error {
 	}
 
 	var provider, migratedPlugin string
-	if cluster.Spec.CloudConfig != nil {
-		switch {
-		case cluster.Spec.CloudConfig.AWSEBSCSIDriver != nil &&
-			cluster.Spec.CloudConfig.AWSEBSCSIDriver.Enabled != nil &&
-			*cluster.Spec.CloudConfig.AWSEBSCSIDriver.Enabled:
-			provider = "aws-ebs"
-			migratedPlugin = "kubernetes.io/aws-ebs"
-		case cluster.Spec.CloudConfig.GCPPDCSIDriver != nil &&
-			cluster.Spec.CloudConfig.GCPPDCSIDriver.Enabled != nil &&
-			*cluster.Spec.CloudConfig.GCPPDCSIDriver.Enabled:
-			provider = "gcp-pd"
-			migratedPlugin = "kubernetes.io/gce-pd"
-		}
+	switch {
+	case cluster.Spec.CloudConfig != nil &&
+		cluster.Spec.CloudConfig.AWSEBSCSIDriver != nil &&
+		cluster.Spec.CloudConfig.AWSEBSCSIDriver.Enabled != nil &&
+		*cluster.Spec.CloudConfig.AWSEBSCSIDriver.Enabled:
+		provider = "aws-ebs"
+		migratedPlugin = "kubernetes.io/aws-ebs"
+	case cluster.Spec.CloudConfig != nil &&
+		cluster.Spec.CloudConfig.GCPPDCSIDriver != nil &&
+		cluster.Spec.CloudConfig.GCPPDCSIDriver.Enabled != nil &&
+		*cluster.Spec.CloudConfig.GCPPDCSIDriver.Enabled:
+		provider = "gcp-pd"
+		migratedPlugin = "kubernetes.io/gce-pd"
+	case cluster.Spec.LegacyCloudProvider == "digitalocean":
+		provider = "dobs"
 	}
 
 	if provider == "" {
@@ -474,7 +476,10 @@ func (t *Tester) addCSIDriverFlags() error {
 		return fmt.Errorf("writing driver.yaml: %w", err)
 	}
 
-	driverFlags := fmt.Sprintf(" --storage.testdriver=%s --storage.migratedPlugins=%s", driverPath, migratedPlugin)
+	driverFlags := fmt.Sprintf(" --storage.testdriver=%s", driverPath)
+	if migratedPlugin != "" {
+		driverFlags += fmt.Sprintf(" --storage.migratedPlugins=%s", migratedPlugin)
+	}
 	klog.Infof("Setting %v", driverFlags)
 	t.TestArgs += driverFlags
 	return nil