Merge pull request #18201 from hakman/skip-intree-volume-tests

e2e: Stop running in-tree volume tests for CSI-migrated drivers

Author: k8s-ci-robot

nodeup/pkg/model/cloudconfig.go

@@ -63,7 +63,9 @@ type CloudConfigBuilder struct {
 var _ fi.NodeupModelBuilder = &CloudConfigBuilder{}
 
 func (b *CloudConfigBuilder) Build(c *fi.NodeupModelBuilderContext) error {
-	if !b.HasAPIServer && b.NodeupConfig.KubeletConfig.CloudProvider == "external" {
+	// Azure worker nodes need azure.json for the azuredisk-csi-driver to query
+	// zone information from IMDS, so we always write it regardless of role.
+	if !b.HasAPIServer && b.NodeupConfig.KubeletConfig.CloudProvider == "external" && b.CloudProvider() != kops.CloudProviderAzure {
 		return nil
 	}
 

tests/e2e/pkg/tester/skip_regex.go

@@ -25,7 +25,7 @@ import (
 )
 
 const (
-	skipRegexBase = "\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\]|\\[Feature:.+\\]|nfs|NFS"
+	skipRegexBase = "\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\]|\\[Feature:.+\\]|nfs|NFS|In-tree.Volumes.\\[Driver:.(?:aws|gce|azure|cinder|vsphere)"
 )
 
 func (t *Tester) setSkipRegexFlag() error {
@@ -107,12 +107,6 @@ func (t *Tester) setSkipRegexFlag() error {
 		// latency during rapid attach/detach cycles on VMSS nodes.
 		// See https://github.com/kubernetes/kops/issues/17146
 		skipRegex += "|fsgroupchangepolicy"
-		// 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"
 		// Skipped upstream in azuredisk-csi-driver external E2E:
 		// https://github.com/kubernetes-sigs/azuredisk-csi-driver/blob/master/test/external-e2e/run.sh
 		skipRegex += "|should.resize.volume.when.PVC.is.edited.while.pod.is.using.it"
@@ -124,8 +118,6 @@ func (t *Tester) setSkipRegexFlag() error {
 		// this test assumes the cluster runs COS but kOps uses Ubuntu by default
 		// ref: https://github.com/kubernetes/test-infra/pull/22190
 		skipRegex += "|should.be.mountable.when.non-attachable"
-		// The in-tree driver and its E2E tests use `topology.kubernetes.io/zone` but the CSI driver uses `topology.gke.io/zone`
-		skipRegex += "|In-tree.Volumes.\\[Driver:.gcepd\\].*topology.should.provision.a.volume.and.schedule.a.pod.with.AllowedTopologies"
 	}
 
 	// This test fails on RHEL-based distros because they return fully qualified hostnames yet the k8s node names are not fully qualified.

tests/e2e/pkg/tester/tester.go

@@ -421,24 +421,27 @@ func (t *Tester) addCSIDriverFlags() error {
 		return err
 	}
 
-	var provider, migratedPlugin string
-	switch {
-	case cluster.Spec.CloudConfig != nil &&
-		cluster.Spec.CloudConfig.AWSEBSCSIDriver != nil &&
-		cluster.Spec.CloudConfig.AWSEBSCSIDriver.Enabled != nil &&
-		*cluster.Spec.CloudConfig.AWSEBSCSIDriver.Enabled:
+	var provider string
+	switch cluster.Spec.LegacyCloudProvider {
+	case "aws":
+		if cluster.Spec.CloudConfig != nil &&
+			cluster.Spec.CloudConfig.AWSEBSCSIDriver != nil &&
+			cluster.Spec.CloudConfig.AWSEBSCSIDriver.Enabled != nil &&
+			!*cluster.Spec.CloudConfig.AWSEBSCSIDriver.Enabled {
+			break
+		}
 		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:
+	case "gce":
+		if cluster.Spec.CloudConfig != nil &&
+			cluster.Spec.CloudConfig.GCPPDCSIDriver != nil &&
+			cluster.Spec.CloudConfig.GCPPDCSIDriver.Enabled != nil &&
+			!*cluster.Spec.CloudConfig.GCPPDCSIDriver.Enabled {
+			break
+		}
 		provider = "gcp-pd"
-		migratedPlugin = "kubernetes.io/gce-pd"
-	case cluster.Spec.LegacyCloudProvider == "azure":
+	case "azure":
 		provider = "azure-disk"
-		migratedPlugin = "kubernetes.io/azure-disk"
-	case cluster.Spec.LegacyCloudProvider == "digitalocean":
+	case "digitalocean":
 		provider = "dobs"
 	}
 
@@ -478,9 +481,6 @@ func (t *Tester) addCSIDriverFlags() error {
 	}
 
 	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

tests/integration/update_cluster/minimal_azure/data/azurerm_storage_blob_minimal-azure.example.com-addons-azuredisk-csi-driver.addons.k8s.io-k8s-1.31_source

@@ -642,7 +642,7 @@ spec:
         - --user-agent-suffix=kops
         - --allow-empty-cloud-config=true
         - --support-zone=true
-        - --get-node-info-from-labels=true
+        - --get-node-info-from-labels=false
         - --get-nodeid-from-imds=false
         - --enable-otel-tracing=false
         - --metrics-address=0.0.0.0:29605

tests/integration/update_cluster/minimal_azure/data/azurerm_storage_blob_minimal-azure.example.com-addons-bootstrap_source

@@ -85,7 +85,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.31
     manifest: azuredisk-csi-driver.addons.k8s.io/k8s-1.31.yaml
-    manifestHash: da0ccb52e5db231adbe24c372b9e2e87ea02f9559e80e09b6dbcbc094371220f
+    manifestHash: 83b05a6f607c03094725ec171a8c7b2f073eaafa6830dfcf0b29ad90b728b17b
     name: azuredisk-csi-driver.addons.k8s.io
     prune:
       kinds:

upup/models/cloudup/resources/addons/azuredisk-csi-driver.addons.k8s.io/helm-values.yaml

@@ -6,8 +6,8 @@
 #     --version 1.34.0 --namespace kube-system -f helm-values.yaml > k8s-1.31.yaml.template
 #
 # Note: No kops-specific patches are needed. The driver finds the cloud config
-# at /etc/kubernetes/azure.json (its default path) on control-plane nodes.
-# Node pods use --get-node-info-from-labels and --allow-empty-cloud-config=true.
+# at /etc/kubernetes/azure.json (its default path) on all nodes.
+# Node pods query IMDS for zone info via the cloud config (UseInstanceMetadata: true).
 #
 # Note: StorageClass is managed separately via storage-azure.addons.k8s.io
 
@@ -22,7 +22,6 @@ controller:
 linux:
   enabled: true
   hostNetwork: true
-  getNodeInfoFromLabels: true
 
 node:
   cloudConfigSecretName: ""

upup/models/cloudup/resources/addons/azuredisk-csi-driver.addons.k8s.io/k8s-1.31.yaml.template

@@ -414,7 +414,7 @@ spec:
             - "--user-agent-suffix=kops"
             - "--allow-empty-cloud-config=true"
             - "--support-zone=true"
-            - "--get-node-info-from-labels=true"
+            - "--get-node-info-from-labels=false"
             - "--get-nodeid-from-imds=false"
             - "--enable-otel-tracing=false"
             - "--metrics-address=0.0.0.0:29605"