Merge pull request openshift#2416 from tjungblu/OCPBUGS-55661

OCPBUGS-55661: Remove HardwareSpeed featuregate

Author: openshift-merge-bot[bot]

features.md

@@ -78,7 +78,6 @@
 | ConsolePluginContentSecurityPolicy| <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>  |
 | 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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | GatewayAPIController| <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>  |
 | IngressControllerLBSubnetsAWS| <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>  |
 | MachineConfigNodes| <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

@@ -267,14 +267,6 @@ var (
 					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
-	FeatureGateHardwareSpeed = newFeatureGate("HardwareSpeed").
-					reportProblemsToJiraComponent("etcd").
-					contactPerson("hasbro17").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
-
 	FeatureGateBackendQuotaGiB = newFeatureGate("EtcdBackendQuota").
 					reportProblemsToJiraComponent("etcd").
 					contactPerson("hasbro17").

operator/v1/types_etcd.go

@@ -38,7 +38,6 @@ type EtcdSpec struct {
 	// 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.
-	// +openshift:enable:FeatureGate=HardwareSpeed
 	// +optional
 	HardwareSpeed ControlPlaneHardwareSpeed `json:"controlPlaneHardwareSpeed"`
 

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

@@ -155,7 +155,6 @@ etcds.operator.openshift.io:
   Category: coreoperators
   FeatureGates:
   - EtcdBackendQuota
-  - HardwareSpeed
   FilenameOperatorName: etcd
   FilenameOperatorOrdering: "01"
   FilenameRunLevel: "0000_12"

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

@@ -46,6 +46,19 @@ spec:
             type: object
           spec:
             properties:
+              controlPlaneHardwareSpeed:
+                description: "HardwareSpeed allows user to change the etcd tuning
+                  profile which configures\nthe latency parameters for heartbeat interval
+                  and leader election timeouts\nallowing the cluster to tolerate longer
+                  round-trip-times between etcd members.\nValid values are \"\", \"Standard\"
+                  and \"Slower\".\n\t\"\" means no opinion and the platform is left
+                  to choose a reasonable default\n\twhich 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

operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/EtcdBackendQuota.yaml

@@ -59,6 +59,19 @@ spec:
                 x-kubernetes-validations:
                 - message: etcd backendQuotaGiB may not be decreased
                   rule: self>=oldSelf
+              controlPlaneHardwareSpeed:
+                description: "HardwareSpeed allows user to change the etcd tuning
+                  profile which configures\nthe latency parameters for heartbeat interval
+                  and leader election timeouts\nallowing the cluster to tolerate longer
+                  round-trip-times between etcd members.\nValid values are \"\", \"Standard\"
+                  and \"Slower\".\n\t\"\" means no opinion and the platform is left
+                  to choose a reasonable default\n\twhich 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