Merge pull request #2593 from benluddy/tpnu-clientsallowcbor-disable

openshift-merge-bot[bot] · web-flow · commit 1ef028d1e4ba · 2025-11-22T01:13:07.000Z
Disable TPNU/DPNU ClientsAllowCBOR for large list decodes.
diff --git 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| | | | | |  |
@@ -32,7 +33,6 @@
 | BootcNodeManagement| | | <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>  |
 | CBORServingAndStorage| | | <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>  |
 | CRDCompatibilityRequirementOperator| | | <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>  |
-| ClientsAllowCBOR| | | <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>  |
 | ClientsPreferCBOR| | | <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>  |
 | ClusterAPIInstallIBMCloud| | | <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>  |
 | ClusterAPIMachineManagement| | | <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
@@ -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
@@ -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
@@ -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
@@ -14,6 +14,9 @@
         "featureGates": [
             {
                 "disabled": [
+                    {
+                        "name": "ClientsAllowCBOR"
+                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
@@ -94,9 +97,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
@@ -14,6 +14,9 @@
         "featureGates": [
             {
                 "disabled": [
+                    {
+                        "name": "ClientsAllowCBOR"
+                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
@@ -109,9 +112,6 @@
                     {
                         "name": "CRDCompatibilityRequirementOperator"
                     },
-                    {
-                        "name": "ClientsAllowCBOR"
-                    },
                     {
                         "name": "ClientsPreferCBOR"
                     },

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@`
`14`	`14`	`"featureGates": [`
`15`	`15`	`{`
`16`	`16`	`"disabled": [`
	`17`	`+ {`
	`18`	`+ "name": "ClientsAllowCBOR"`
	`19`	`+ },`
`17`	`20`	`{`
`18`	`21`	`"name": "ClusterAPIInstall"`
`19`	`22`	`},`
`@@ -112,9 +115,6 @@`
`112`	`115`	`{`
`113`	`116`	`"name": "CRDCompatibilityRequirementOperator"`
`114`	`117`	`},`
`115`		`- {`
`116`		`- "name": "ClientsAllowCBOR"`
`117`		`- },`
`118`	`118`	`{`
`119`	`119`	`"name": "ClientsPreferCBOR"`
`120`	`120`	`},`