[ETCD-488] Move etcd hardware speed feature to GA

openshift · May 16, 2024 · 92606cc · 92606cc
1 parent 0f9dbca
commit 92606cc
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/features.md b/features.md
@@ -22,7 +22,6 @@
 | GCPClusterHostedDNS| | | <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>  |
 | GCPLabelsTags| | | <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>  |
 | GatewayAPI| | | <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>  |
-| HardwareSpeed| | | <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>  |
 | ImagePolicy| | | <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>  |
 | InsightsConfig| | | <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>  |
 | InsightsConfigAPI| | | <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>  |
@@ -64,6 +63,7 @@
 | ExternalCloudProviderAzure| <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>  |
 | ExternalCloudProviderExternal| <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>  |
 | ExternalCloudProviderGCP| <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>  |
+| HardwareSpeed| <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>  |
 | KMSv1| <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>  |
 | MetricsServer| <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>  |
 | NetworkDiagnosticsConfig| <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>  |

diff --git a/features/features.go b/features/features.go
@@ -249,7 +249,7 @@ var (
 					reportProblemsToJiraComponent("etcd").
 					contactPerson("hasbro17").
 					productScope(ocpSpecific).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
 	FeatureGateBackendQuotaGiB = newFeatureGate("EtcdBackendQuota").

diff --git a/operator/v1/tests/etcds.operator.openshift.io/HardwareSpeed.yaml b/operator/v1/tests/etcds.operator.openshift.io/HardwareSpeed.yaml
@@ -1,7 +1,7 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "Etcd"
 crdName: etcds.operator.openshift.io
-featureGate: HardwareSpeed
+featureGate: -EtcdBackendQuota
 tests:
   onCreate:
     - name: Should be able to create with Standard hardware speed

diff --git a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-Default.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-Default.crd.yaml
@@ -40,6 +40,18 @@ spec:
             type: object
           spec:
             properties:
+              controlPlaneHardwareSpeed:
+                description: HardwareSpeed allows user to change the etcd tuning profile
+                  which configures the latency parameters for heartbeat interval and
+                  leader election timeouts allowing the cluster to tolerate longer
+                  round-trip-times between etcd members. Valid values are "", "Standard"
+                  and "Slower". "" means no opinion and the platform is left to choose
+                  a reasonable default which is subject to change without notice.
+                enum:
+                - ""
+                - Standard
+                - Slower
+                type: string
               failedRevisionLimit:
                 description: failedRevisionLimit is the number of failed static pod
                   installer revisions to keep on disk and in the api -1 = unlimited,

diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -76,9 +76,6 @@
                     {
                         "name": "GatewayAPI"
                     },
-                    {
-                        "name": "HardwareSpeed"
-                    },
                     {
                         "name": "ImagePolicy"
                     },
@@ -207,6 +204,9 @@
                     {
                         "name": "ExternalOIDC"
                     },
+                    {
+                        "name": "HardwareSpeed"
+                    },
                     {
                         "name": "KMSv1"
                     },

diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -79,9 +79,6 @@
                     {
                         "name": "GatewayAPI"
                     },
-                    {
-                        "name": "HardwareSpeed"
-                    },
                     {
                         "name": "ImagePolicy"
                     },
@@ -207,6 +204,9 @@
                     {
                         "name": "ExternalCloudProviderGCP"
                     },
+                    {
+                        "name": "HardwareSpeed"
+                    },
                     {
                         "name": "KMSv1"
                     },