make update

openshift · Apr 23, 2024 · cbb3e13 · cbb3e13
1 parent ac9201e
commit cbb3e13
Show file tree

Hide file tree

Showing 16 changed files with 422 additions and 60 deletions.
diff --git a/features.md b/features.md
@@ -3,6 +3,7 @@
 | ClusterAPIInstall| | | | | |  |
 | EventedPLEG| | | | | |  |
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | |  |
+| AWSEFSDriverVolumeMetrics| | | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | AutomatedEtcdBackup| | | <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>  |
 | CSIDriverSharedResource| | | <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>  |
 | DNSNameResolver| | | <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>  |

diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go
diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -25388,16 +25388,12 @@
       "type": "object",
       "properties": {
         "efsVolumeMetricsFSRateLimit": {
-          "description": "efsVolumeMetricsFSRateLimit defines the rate limit, in goroutines per file system, for processing volume metrics. Requires efsVolumeMetricsOptIn to be enabled. The default rate limit set by the EFS CSI driver is 240 goroutines per file system.",
+          "description": "efsVolumeMetricsFSRateLimit defines the rate limit, in goroutines per file system, for processing volume metrics. Requires efsVolumeMetricsRefreshPeriod to be set to a value greater than 0. The default rate limit set by the EFS CSI driver is 240 goroutines per file system.",
           "type": "integer",
           "format": "int32"
         },
-        "efsVolumeMetricsOptIn": {
-          "description": "efsVolumeMetricsOptIn enables metrics for EFS CSI Driver volumes. When enabled, the CSI driver traverses the entire volume to calculate and return metrics. This operation can significantly impact system performance due to the extensive volume walk required. Use with caution in performance-sensitive environments.",
-          "type": "boolean"
-        },
         "efsVolumeMetricsRefreshPeriod": {
-          "description": "efsVolumeMetricsRefreshPeriod specifies the frequency, in minutes, at which volume metrics are refreshed. Requires efsVolumeMetricsOptIn to be enabled to take effect. The default refresh period in the EFS CSI driver is 240 minutes.",
+          "description": "efsVolumeMetricsRefreshPeriod specifies the frequency, in minutes, at which volume metrics are refreshed. This field enables metric collection when set to a value greater than 0. The default refresh period in the EFS CSI driver is 240 minutes.",
           "type": "integer",
           "format": "int32"
         },

diff --git a/..._generated.crd-manifests/0000_90_csi-driver_01_clustercsidrivers-CustomNoUpgrade.crd.yaml b/..._generated.crd-manifests/0000_90_csi-driver_01_clustercsidrivers-CustomNoUpgrade.crd.yaml
@@ -71,6 +71,20 @@ spec:
                   aws:
                     description: aws is used to configure the AWS CSI driver.
                     properties:
+                      efsVolumeMetricsFSRateLimit:
+                        description: efsVolumeMetricsFSRateLimit defines the rate
+                          limit, in goroutines per file system, for processing volume
+                          metrics. Requires efsVolumeMetricsRefreshPeriod to be set
+                          to a value greater than 0. The default rate limit set by
+                          the EFS CSI driver is 240 goroutines per file system.
+                        type: integer
+                      efsVolumeMetricsRefreshPeriod:
+                        description: efsVolumeMetricsRefreshPeriod specifies the frequency,
+                          in minutes, at which volume metrics are refreshed. This
+                          field enables metric collection when set to a value greater
+                          than 0. The default refresh period in the EFS CSI driver
+                          is 240 minutes.
+                        type: integer
                       kmsKeyARN:
                         description: kmsKeyARN sets the cluster default storage class
                           to encrypt volumes with a user-defined KMS key, rather than

diff --git a/...or/v1/zz_generated.crd-manifests/0000_90_csi-driver_01_clustercsidrivers-Default.crd.yaml b/...or/v1/zz_generated.crd-manifests/0000_90_csi-driver_01_clustercsidrivers-Default.crd.yaml
@@ -71,27 +71,6 @@ spec:
                   aws:
                     description: aws is used to configure the AWS CSI driver.
                     properties:
-                      efsVolumeMetricsFSRateLimit:
-                        description: efsVolumeMetricsFSRateLimit defines the rate
-                          limit, in goroutines per file system, for processing volume
-                          metrics. Requires efsVolumeMetricsOptIn to be enabled. The
-                          default rate limit set by the EFS CSI driver is 240 goroutines
-                          per file system.
-                        type: integer
-                      efsVolumeMetricsOptIn:
-                        description: efsVolumeMetricsOptIn enables metrics for EFS
-                          CSI Driver volumes. When enabled, the CSI driver traverses
-                          the entire volume to calculate and return metrics. This
-                          operation can significantly impact system performance due
-                          to the extensive volume walk required. Use with caution
-                          in performance-sensitive environments.
-                        type: boolean
-                      efsVolumeMetricsRefreshPeriod:
-                        description: efsVolumeMetricsRefreshPeriod specifies the frequency,
-                          in minutes, at which volume metrics are refreshed. Requires
-                          efsVolumeMetricsOptIn to be enabled to take effect. The
-                          default refresh period in the EFS CSI driver is 240 minutes.
-                        type: integer
                       kmsKeyARN:
                         description: kmsKeyARN sets the cluster default storage class
                           to encrypt volumes with a user-defined KMS key, rather than

diff --git a/...rated.crd-manifests/0000_90_csi-driver_01_clustercsidrivers-TechPreviewNoUpgrade.crd.yaml b/...rated.crd-manifests/0000_90_csi-driver_01_clustercsidrivers-TechPreviewNoUpgrade.crd.yaml
@@ -71,6 +71,20 @@ spec:
                   aws:
                     description: aws is used to configure the AWS CSI driver.
                     properties:
+                      efsVolumeMetricsFSRateLimit:
+                        description: efsVolumeMetricsFSRateLimit defines the rate
+                          limit, in goroutines per file system, for processing volume
+                          metrics. Requires efsVolumeMetricsRefreshPeriod to be set
+                          to a value greater than 0. The default rate limit set by
+                          the EFS CSI driver is 240 goroutines per file system.
+                        type: integer
+                      efsVolumeMetricsRefreshPeriod:
+                        description: efsVolumeMetricsRefreshPeriod specifies the frequency,
+                          in minutes, at which volume metrics are refreshed. This
+                          field enables metric collection when set to a value greater
+                          than 0. The default refresh period in the EFS CSI driver
+                          is 240 minutes.
+                        type: integer
                       kmsKeyARN:
                         description: kmsKeyARN sets the cluster default storage class
                           to encrypt volumes with a user-defined KMS key, rather than

diff --git a/operator/v1/zz_generated.featuregated-crd-manifests.yaml b/operator/v1/zz_generated.featuregated-crd-manifests.yaml
@@ -69,6 +69,7 @@ clustercsidrivers.operator.openshift.io:
   Capability: ""
   Category: ""
   FeatureGates:
+  - AWSEFSDriverVolumeMetrics
   - VSphereDriverConfiguration
   FilenameOperatorName: csi-driver
   FilenameOperatorOrdering: "01"

diff --git a/...rated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/AAA_ungated.yaml b/...rated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/AAA_ungated.yaml
@@ -50,27 +50,6 @@ spec:
                   aws:
                     description: aws is used to configure the AWS CSI driver.
                     properties:
-                      efsVolumeMetricsFSRateLimit:
-                        description: efsVolumeMetricsFSRateLimit defines the rate
-                          limit, in goroutines per file system, for processing volume
-                          metrics. Requires efsVolumeMetricsOptIn to be enabled. The
-                          default rate limit set by the EFS CSI driver is 240 goroutines
-                          per file system.
-                        type: integer
-                      efsVolumeMetricsOptIn:
-                        description: efsVolumeMetricsOptIn enables metrics for EFS
-                          CSI Driver volumes. When enabled, the CSI driver traverses
-                          the entire volume to calculate and return metrics. This
-                          operation can significantly impact system performance due
-                          to the extensive volume walk required. Use with caution
-                          in performance-sensitive environments.
-                        type: boolean
-                      efsVolumeMetricsRefreshPeriod:
-                        description: efsVolumeMetricsRefreshPeriod specifies the frequency,
-                          in minutes, at which volume metrics are refreshed. Requires
-                          efsVolumeMetricsOptIn to be enabled to take effect. The
-                          default refresh period in the EFS CSI driver is 240 minutes.
-                        type: integer
                       kmsKeyARN:
                         description: kmsKeyARN sets the cluster default storage class
                           to encrypt volumes with a user-defined KMS key, rather than