Merge pull request #2235 from bertinatto/add-cbor-feature-gate

openshift-merge-bot[bot] · web-flow · commit 61248d910ff7 · 2025-09-13T23:21:10.000Z
CNTRLPLANE-5:  Add CBOR feature gate
diff --git a/features.md b/features.md
@@ -27,6 +27,9 @@
 | AzureDualStackInstall| | | <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>  |
 | AzureMultiDisk| | | <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>  |
 | 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>  |
+| 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>  |
 | ClusterMonitoringConfig| | | <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>  |
 | ClusterVersionOperatorConfiguration| | | <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
@@ -881,4 +881,28 @@ var (
 					enhancementPR("https://github.com/openshift/enhancements/pull/1806").
 					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
+
+	FeatureCBORServingAndStorage = newFeatureGate("CBORServingAndStorage").
+					reportProblemsToJiraComponent("kube-apiserver").
+					contactPerson("benluddy").
+					productScope(kubernetes).
+					enhancementPR("https://github.com/kubernetes/enhancements/issues/4222").
+					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+					mustRegister()
+
+	FeatureCBORClientsAllowCBOR = newFeatureGate("ClientsAllowCBOR").
+					reportProblemsToJiraComponent("kube-apiserver").
+					contactPerson("benluddy").
+					productScope(kubernetes).
+					enhancementPR("https://github.com/kubernetes/enhancements/issues/4222").
+					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+					mustRegister()
+
+	FeatureClientsPreferCBOR = newFeatureGate("ClientsPreferCBOR").
+					reportProblemsToJiraComponent("kube-apiserver").
+					contactPerson("benluddy").
+					productScope(kubernetes).
+					enhancementPR("https://github.com/kubernetes/enhancements/issues/4222").
+					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+					mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -49,6 +49,15 @@
                     {
                         "name": "BootcNodeManagement"
                     },
+                    {
+                        "name": "CBORServingAndStorage"
+                    },
+                    {
+                        "name": "ClientsAllowCBOR"
+                    },
+                    {
+                        "name": "ClientsPreferCBOR"
+                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -101,9 +101,18 @@
                     {
                         "name": "BuildCSIVolumes"
                     },
+                    {
+                        "name": "CBORServingAndStorage"
+                    },
                     {
                         "name": "CPMSMachineNamePrefix"
                     },
+                    {
+                        "name": "ClientsAllowCBOR"
+                    },
+                    {
+                        "name": "ClientsPreferCBOR"
+                    },
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -113,9 +113,18 @@
                     {
                         "name": "BuildCSIVolumes"
                     },
+                    {
+                        "name": "CBORServingAndStorage"
+                    },
                     {
                         "name": "CPMSMachineNamePrefix"
                     },
+                    {
+                        "name": "ClientsAllowCBOR"
+                    },
+                    {
+                        "name": "ClientsPreferCBOR"
+                    },
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -49,6 +49,15 @@
                     {
                         "name": "BootcNodeManagement"
                     },
+                    {
+                        "name": "CBORServingAndStorage"
+                    },
+                    {
+                        "name": "ClientsAllowCBOR"
+                    },
+                    {
+                        "name": "ClientsPreferCBOR"
+                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -83,9 +83,18 @@
                     {
                         "name": "BuildCSIVolumes"
                     },
+                    {
+                        "name": "CBORServingAndStorage"
+                    },
                     {
                         "name": "CPMSMachineNamePrefix"
                     },
+                    {
+                        "name": "ClientsAllowCBOR"
+                    },
+                    {
+                        "name": "ClientsPreferCBOR"
+                    },
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -95,9 +95,18 @@
                     {
                         "name": "BuildCSIVolumes"
                     },
+                    {
+                        "name": "CBORServingAndStorage"
+                    },
                     {
                         "name": "CPMSMachineNamePrefix"
                     },
+                    {
+                        "name": "ClientsAllowCBOR"
+                    },
+                    {
+                        "name": "ClientsPreferCBOR"
+                    },
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,18 @@`
`101`	`101`	`{`
`102`	`102`	`"name": "BuildCSIVolumes"`
`103`	`103`	`},`
	`104`	`+ {`
	`105`	`+ "name": "CBORServingAndStorage"`
	`106`	`+ },`
`104`	`107`	`{`
`105`	`108`	`"name": "CPMSMachineNamePrefix"`
`106`	`109`	`},`
	`110`	`+ {`
	`111`	`+ "name": "ClientsAllowCBOR"`
	`112`	`+ },`
	`113`	`+ {`
	`114`	`+ "name": "ClientsPreferCBOR"`
	`115`	`+ },`
`107`	`116`	`{`
`108`	`117`	`"name": "ClusterAPIInstallIBMCloud"`
`109`	`118`	`},`
Original file line number	Diff line number	Diff line change
`@@ -113,9 +113,18 @@`
`113`	`113`	`{`
`114`	`114`	`"name": "BuildCSIVolumes"`
`115`	`115`	`},`
	`116`	`+ {`
	`117`	`+ "name": "CBORServingAndStorage"`
	`118`	`+ },`
`116`	`119`	`{`
`117`	`120`	`"name": "CPMSMachineNamePrefix"`
`118`	`121`	`},`
	`122`	`+ {`
	`123`	`+ "name": "ClientsAllowCBOR"`
	`124`	`+ },`
	`125`	`+ {`
	`126`	`+ "name": "ClientsPreferCBOR"`
	`127`	`+ },`
`119`	`128`	`{`
`120`	`129`	`"name": "ClusterAPIInstallIBMCloud"`
`121`	`130`	`},`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,18 @@`
`83`	`83`	`{`
`84`	`84`	`"name": "BuildCSIVolumes"`
`85`	`85`	`},`
	`86`	`+ {`
	`87`	`+ "name": "CBORServingAndStorage"`
	`88`	`+ },`
`86`	`89`	`{`
`87`	`90`	`"name": "CPMSMachineNamePrefix"`
`88`	`91`	`},`
	`92`	`+ {`
	`93`	`+ "name": "ClientsAllowCBOR"`
	`94`	`+ },`
	`95`	`+ {`
	`96`	`+ "name": "ClientsPreferCBOR"`
	`97`	`+ },`
`89`	`98`	`{`
`90`	`99`	`"name": "ClusterAPIInstallIBMCloud"`
`91`	`100`	`},`
Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,18 @@`
`95`	`95`	`{`
`96`	`96`	`"name": "BuildCSIVolumes"`
`97`	`97`	`},`
	`98`	`+ {`
	`99`	`+ "name": "CBORServingAndStorage"`
	`100`	`+ },`
`98`	`101`	`{`
`99`	`102`	`"name": "CPMSMachineNamePrefix"`
`100`	`103`	`},`
	`104`	`+ {`
	`105`	`+ "name": "ClientsAllowCBOR"`
	`106`	`+ },`
	`107`	`+ {`
	`108`	`+ "name": "ClientsPreferCBOR"`
	`109`	`+ },`
`101`	`110`	`{`
`102`	`111`	`"name": "ClusterAPIInstallIBMCloud"`
`103`	`112`	`},`