address review comments

charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller.yaml

@@ -168,7 +168,7 @@ spec:
         - --leader-election-namespace=kube-system
         - --handle-volume-inuse-error=false
         {{- if ((.Values.csiResizer).featureGates) }}
-        - -feature-gates={{ range $feature, $enabled := .Values.csiResizer.featureGates }}{{ $feature }}={{ $enabled }},{{ end }}
+        - --feature-gates={{ range $feature, $enabled := .Values.csiResizer.featureGates }}{{ $feature }}={{ $enabled }},{{ end }}
         {{- end }}
         - --v=5
         env:

charts/internal/seed-controlplane/charts/csi-driver-controller/values.yaml

@@ -49,10 +49,6 @@ csiSnapshotController:
       cpu: 11m
       memory: 32Mi
 
-csiProvisioner:
-  featureGates:
-    Topology: true
-
 csiSnapshotValidationWebhook:
   replica: 1
   podAnnotations: {}

docs/usage/usage.md

@@ -287,9 +287,9 @@ Every GCP shoot cluster will be deployed with the GCP PD CSI driver.
 It is compatible with the legacy in-tree volume provisioner that was deprecated by the Kubernetes community and will be removed in future versions of Kubernetes.
 End-users might want to update their custom `StorageClass`es to the new `pd.csi.storage.gke.io` provisioner.
 
-## Support for VolumeAttributeClasses (Beta in k8s 1.31)
+## Support for VolumeAttributesClasses (Beta in k8s 1.31)
 
-To have the CSI-Driver configured to support the necessary features for [VolumeAttributeClasses](https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/) on GCP for shoots with a k8s-version greater than 1.31, use the `gcp.provider.extensions.gardener.cloud/enable-volume-attributes-class` annotation on the shoot. Keep in mind to also enable the required feature flags and runtime-config on the common kubernetes controllers (as outlined in the link above) in the shoot-spec.
+To have the CSI-driver configured to support the necessary features for [VolumeAttributesClasses](https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/) on GCP for shoots with a k8s-version greater than 1.31, use the `gcp.provider.extensions.gardener.cloud/enable-volume-attributes-class` annotation on the shoot. Keep in mind to also enable the required feature flags and runtime-config on the common kubernetes controllers (as outlined in the link above) in the shoot-spec.
 
 ## Kubernetes Versions per Worker Pool
 

go.mod

@@ -20,6 +20,7 @@ require (
 	go.uber.org/atomic v1.11.0
 	go.uber.org/mock v0.4.0
 	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
+	golang.org/x/mod v0.21.0
 	golang.org/x/oauth2 v0.22.0
 	golang.org/x/tools v0.25.0
 	google.golang.org/api v0.187.0
@@ -134,7 +135,6 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/crypto v0.27.0 // indirect
-	golang.org/x/mod v0.21.0 // indirect
 	golang.org/x/net v0.29.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect

pkg/controller/controlplane/valuesprovider.go

@@ -24,6 +24,7 @@ import (
 	secretutils "github.com/gardener/gardener/pkg/utils/secrets"
 	secretsmanager "github.com/gardener/gardener/pkg/utils/secrets/manager"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
+	"golang.org/x/mod/semver"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -476,27 +477,26 @@ func getCSIControllerChartValues(
 		},
 	}
 
-	csiProvisionerFeatureGates := map[string]string{
-		"Topology": "true",
-	}
-
-	if _, ok := cluster.Shoot.Annotations[gcp.AnnotationEnableModifyVolume]; ok {
-		csiProvisionerFeatureGates["VolumeAttributesClass"] = "true"
-		values["csiDriver"] = map[string]interface{}{
-			"storage": map[string]interface{}{
-				"supportsDynamicIopsProvisioning":       []string{"hyperdisk-balanced", "hyperdisk-extreme"},
-				"supportsDynamicThroughputProvisioning": []string{"hyperdisk-balanced", "hyperdisk-throughput", "hyperdisk-ml"},
-			},
-		}
-		values["csiResizer"] = map[string]interface{}{
-			"featureGates": map[string]string{
-				"VolumeAttributesClass": "true",
-			},
+	if semver.Compare(cluster.Shoot.Spec.Kubernetes.Version, "1.30.0") > 0 {
+		if _, ok := cluster.Shoot.Annotations[gcp.AnnotationEnableVolumeAttributesClass]; ok {
+			values["csiDriver"] = map[string]interface{}{
+				"storage": map[string]interface{}{
+					"supportsDynamicIopsProvisioning":       []string{"hyperdisk-balanced", "hyperdisk-extreme"},
+					"supportsDynamicThroughputProvisioning": []string{"hyperdisk-balanced", "hyperdisk-throughput", "hyperdisk-ml"},
+				},
+			}
+			values["csiResizer"] = map[string]interface{}{
+				"featureGates": map[string]string{
+					"VolumeAttributesClass": "true",
+				},
+			}
+			values["csiProvisioner"] = map[string]interface{}{
+				"featureGates": map[string]string{
+					"VolumeAttributesClass": "true",
+				},
+			}
 		}
-	}
 
-	values["csiProvisioner"] = map[string]interface{}{
-		"featureGates": csiProvisionerFeatureGates,
 	}
 
 	return values, nil

pkg/controller/controlplane/valuesprovider_test.go

@@ -262,11 +262,6 @@ var _ = Describe("ValuesProvider", func() {
 						},
 						"topologyAwareRoutingEnabled": false,
 					},
-					"csiProvisioner": map[string]interface{}{
-						"featureGates": map[string]string{
-							"Topology": "true",
-						},
-					},
 				}),
 			}))
 		})

pkg/gcp/types.go

@@ -81,8 +81,8 @@ const (
 	SeedAnnotationKeyUseFlow = AnnotationKeyUseFlow
 	// SeedAnnotationUseFlowValueNew is the value to restrict flow reconciliation to new shoot clusters
 	SeedAnnotationUseFlowValueNew = "new"
-	// AnnotationEnableModifyVolume is the annotation to use when enabling the modify-volume feature (VolumeAttributesClass)
-	AnnotationEnableModifyVolume = "gcp.provider.extensions.gardener.cloud/enable-volume-attributes-class"
+	// AnnotationEnableVolumeAttributesClass is the annotation to use on shoots to enable VolumeAttributesClasses
+	AnnotationEnableVolumeAttributesClass = "gcp.provider.extensions.gardener.cloud/enable-volume-attributes-class"
 )
 
 var (