Merge pull request openshift#2395 from rhrmo/OCPBUGS-55674

OCPBUGS-55674: remove AWSEFSDriverVolumeMetrics featuregate

Author: openshift-merge-bot[bot]

features.md

@@ -66,7 +66,6 @@
 | VolumeAttributesClass| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | VolumeGroupSnapshot| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ExternalOIDC| <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
-| AWSEFSDriverVolumeMetrics| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | AdditionalRoutingCapabilities| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | AdminNetworkPolicy| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | AlibabaPlatform| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |

features/features.go

@@ -626,14 +626,6 @@ var (
 							enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 							mustRegister()
 
-	FeatureGateAWSEFSDriverVolumeMetrics = newFeatureGate("AWSEFSDriverVolumeMetrics").
-						reportProblemsToJiraComponent("Storage / Kubernetes External Components").
-						contactPerson("fbertina").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
-
 	FeatureGateImageStreamImportMode = newFeatureGate("ImageStreamImportMode").
 						reportProblemsToJiraComponent("Multi-Arch").
 						contactPerson("psundara").

operator/v1/tests/clustercsidrivers.operator.openshift.io/AWSEFSDriverVolumeMetrics.yaml

@@ -1,8 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "ClusterCSIDriver"
 crdName: clustercsidrivers.operator.openshift.io
-featureGates:
-- AWSEFSDriverVolumeMetrics
 tests:
   onCreate:
   - name: Should be able to create a minimal ClusterCSIDriver

operator/v1/types_csi_cluster_driver.go

@@ -169,7 +169,6 @@ type AWSCSIDriverConfigSpec struct {
 	KMSKeyARN string `json:"kmsKeyARN,omitempty"`
 
 	// efsVolumeMetrics sets the configuration for collecting metrics from EFS volumes used by the EFS CSI Driver.
-	// +openshift:enable:FeatureGate=AWSEFSDriverVolumeMetrics
 	// +optional
 	EFSVolumeMetrics *AWSEFSVolumeMetrics `json:"efsVolumeMetrics,omitempty"`
 }

operator/v1/zz_generated.featuregated-crd-manifests.yaml

@@ -69,7 +69,6 @@ clustercsidrivers.operator.openshift.io:
   Capability: ""
   Category: ""
   FeatureGates:
-  - AWSEFSDriverVolumeMetrics
   - VSphereConfigurableMaxAllowedBlockVolumesPerNode
   FilenameOperatorName: csi-driver
   FilenameOperatorOrdering: "01"

operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/AAA_ungated.yaml

@@ -56,6 +56,50 @@ spec:
                   aws:
                     description: aws is used to configure the AWS CSI driver.
                     properties:
+                      efsVolumeMetrics:
+                        description: efsVolumeMetrics sets the configuration for collecting
+                          metrics from EFS volumes used by the EFS CSI Driver.
+                        properties:
+                          recursiveWalk:
+                            description: |-
+                              recursiveWalk provides additional configuration for collecting volume metrics in the AWS EFS CSI Driver
+                              when the state is set to RecursiveWalk.
+                            properties:
+                              fsRateLimit:
+                                description: |-
+                                  fsRateLimit defines the rate limit, in goroutines per file system, for processing volume metrics.
+                                  When omitted, this means no opinion and the platform is left to choose a reasonable
+                                  default, which is subject to change over time. The current default is 5.
+                                  The valid range is from 1 to 100 goroutines.
+                                format: int32
+                                maximum: 100
+                                minimum: 1
+                                type: integer
+                              refreshPeriodMinutes:
+                                description: |-
+                                  refreshPeriodMinutes specifies the frequency, in minutes, at which volume metrics are refreshed.
+                                  When omitted, this means no opinion and the platform is left to choose a reasonable
+                                  default, which is subject to change over time. The current default is 240.
+                                  The valid range is from 1 to 43200 minutes (30 days).
+                                format: int32
+                                maximum: 43200
+                                minimum: 1
+                                type: integer
+                            type: object
+                          state:
+                            description: |-
+                              state defines the state of metric collection in the AWS EFS CSI Driver.
+                              This field is required and must be set to one of the following values: Disabled or RecursiveWalk.
+                              Disabled means no metrics collection will be performed. This is the default value.
+                              RecursiveWalk means the AWS EFS CSI Driver will recursively scan volumes to collect metrics.
+                              This process may result in high CPU and memory usage, depending on the volume size.
+                            enum:
+                            - RecursiveWalk
+                            - Disabled
+                            type: string
+                        required:
+                        - state
+                        type: object
                       kmsKeyARN:
                         description: |-
                           kmsKeyARN sets the cluster default storage class to encrypt volumes with a user-defined KMS key,