diff --git a/features.md b/features.md
index e74ac0734bf..559557a9e36 100644
--- a/features.md
+++ b/features.md
@@ -1,5 +1,6 @@
| FeatureGate | Default on Hypershift | Default on SelfManagedHA | DevPreviewNoUpgrade on Hypershift | DevPreviewNoUpgrade on SelfManagedHA | TechPreviewNoUpgrade on Hypershift | TechPreviewNoUpgrade on SelfManagedHA |
| ------ | --- | --- | --- | --- | --- | --- |
+| ClientsAllowCBOR| | | | | | |
| ClusterAPIInstall| | | | | | |
| EventedPLEG| | | | | | |
| MachineAPIOperatorDisableMachineHealthCheckController| | | | | | |
@@ -31,7 +32,6 @@
| BootcNodeManagement| | | Enabled | Enabled | Enabled | Enabled |
| CBORServingAndStorage| | | Enabled | Enabled | Enabled | Enabled |
| CRDCompatibilityRequirementOperator| | | Enabled | Enabled | Enabled | Enabled |
-| ClientsAllowCBOR| | | Enabled | Enabled | Enabled | Enabled |
| ClientsPreferCBOR| | | Enabled | Enabled | Enabled | Enabled |
| ClusterAPIInstallIBMCloud| | | Enabled | Enabled | Enabled | Enabled |
| ClusterAPIMachineManagement| | | Enabled | Enabled | Enabled | Enabled |
diff --git a/features/features.go b/features/features.go
index 4dbc7fa02fc..4815a6795ce 100644
--- a/features/features.go
+++ b/features/features.go
@@ -883,7 +883,6 @@ var (
contactPerson("benluddy").
productScope(kubernetes).
enhancementPR("https://github.com/kubernetes/enhancements/issues/4222").
- enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
mustRegister()
FeatureClientsPreferCBOR = newFeatureGate("ClientsPreferCBOR").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index 0c239822665..57d8afa1880 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -14,6 +14,9 @@
"featureGates": [
{
"disabled": [
+ {
+ "name": "ClientsAllowCBOR"
+ },
{
"name": "ClusterAPIInstall"
},
@@ -112,9 +115,6 @@
{
"name": "CRDCompatibilityRequirementOperator"
},
- {
- "name": "ClientsAllowCBOR"
- },
{
"name": "ClientsPreferCBOR"
},
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
index f74b13b4f52..c0db13efd8a 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -14,6 +14,9 @@
"featureGates": [
{
"disabled": [
+ {
+ "name": "ClientsAllowCBOR"
+ },
{
"name": "ClusterAPIInstall"
},
@@ -127,9 +130,6 @@
{
"name": "CRDCompatibilityRequirementOperator"
},
- {
- "name": "ClientsAllowCBOR"
- },
{
"name": "ClientsPreferCBOR"
},
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 2bdafb6cf95..682f5119b19 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -14,6 +14,9 @@
"featureGates": [
{
"disabled": [
+ {
+ "name": "ClientsAllowCBOR"
+ },
{
"name": "ClusterAPIInstall"
},
@@ -91,9 +94,6 @@
{
"name": "CRDCompatibilityRequirementOperator"
},
- {
- "name": "ClientsAllowCBOR"
- },
{
"name": "ClientsPreferCBOR"
},
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index 1a1378733f4..2728833f7d4 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -14,6 +14,9 @@
"featureGates": [
{
"disabled": [
+ {
+ "name": "ClientsAllowCBOR"
+ },
{
"name": "ClusterAPIInstall"
},
@@ -106,9 +109,6 @@
{
"name": "CRDCompatibilityRequirementOperator"
},
- {
- "name": "ClientsAllowCBOR"
- },
{
"name": "ClientsPreferCBOR"
},