diff --git a/features.md b/features.md
index bb6bbde0379..dff045c51e5 100644
--- a/features.md
+++ b/features.md
@@ -58,7 +58,6 @@
| ConfigurablePKI| | | Enabled | Enabled | | | Enabled | Enabled |
| DNSNameResolver| | | Enabled | Enabled | | | Enabled | Enabled |
| DyanmicServiceEndpointIBMCloud| | | Enabled | Enabled | | | Enabled | Enabled |
-| EtcdBackendQuota| | | Enabled | Enabled | | | Enabled | Enabled |
| Example| | | Enabled | Enabled | | | Enabled | Enabled |
| ExternalOIDCExternalClaimsSourcing| | | Enabled | Enabled | | | Enabled | Enabled |
| ExternalOIDCWithUpstreamParity| | | Enabled | Enabled | | | Enabled | Enabled |
@@ -103,6 +102,7 @@
| BuildCSIVolumes| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| DualReplica| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| EVPN| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
+| EtcdBackendQuota| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| EventTTL| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| ExternalOIDC| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| ExternalOIDCWithUIDAndExtraClaimMappings| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
diff --git a/features/features.go b/features/features.go
index bfa951e0889..856522aba1c 100644
--- a/features/features.go
+++ b/features/features.go
@@ -222,8 +222,8 @@ var (
reportProblemsToJiraComponent("etcd").
contactPerson("hasbro17").
productScope(ocpSpecific).
- enhancementPR(legacyFeatureGateWithoutEnhancement).
- enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+ enhancementPR("https://github.com/openshift/enhancements/pull/2031").
+ enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
mustRegister()
FeatureGateAutomatedEtcdBackup = newFeatureGate("AutomatedEtcdBackup").
@@ -673,7 +673,7 @@ var (
enhancementPR("https://github.com/openshift/enhancements/pull/2033").
enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()).
mustRegister()
-
+
FeatureGateIngressControllerMultipleHAProxyVersions = newFeatureGate("IngressControllerMultipleHAProxyVersions").
reportProblemsToJiraComponent("Networking/router").
contactPerson("miciah").
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
index 652a75a6c7b..3978104fcd2 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -122,9 +122,6 @@
{
"name": "DyanmicServiceEndpointIBMCloud"
},
- {
- "name": "EtcdBackendQuota"
- },
{
"name": "EventedPLEG"
},
@@ -322,6 +319,9 @@
{
"name": "EVPN"
},
+ {
+ "name": "EtcdBackendQuota"
+ },
{
"name": "EventTTL"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
index 2781dee4db1..0b05827932f 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -124,9 +124,6 @@
{
"name": "DyanmicServiceEndpointIBMCloud"
},
- {
- "name": "EtcdBackendQuota"
- },
{
"name": "EventedPLEG"
},
@@ -324,6 +321,9 @@
{
"name": "EVPN"
},
+ {
+ "name": "EtcdBackendQuota"
+ },
{
"name": "EventTTL"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
index f35a08787c4..1c119aee039 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -122,9 +122,6 @@
{
"name": "DyanmicServiceEndpointIBMCloud"
},
- {
- "name": "EtcdBackendQuota"
- },
{
"name": "EventedPLEG"
},
@@ -316,6 +313,9 @@
{
"name": "EVPN"
},
+ {
+ "name": "EtcdBackendQuota"
+ },
{
"name": "EventTTL"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
index 3c538484574..dbbe92831a3 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -124,9 +124,6 @@
{
"name": "DyanmicServiceEndpointIBMCloud"
},
- {
- "name": "EtcdBackendQuota"
- },
{
"name": "EventedPLEG"
},
@@ -318,6 +315,9 @@
{
"name": "EVPN"
},
+ {
+ "name": "EtcdBackendQuota"
+ },
{
"name": "EventTTL"
},