Merge pull request #2249 from JoelSpeed/drop-default-kube-gates

openshift-merge-bot[bot] · web-flow · commit b7d0ca2f7643 · 2025-05-09T20:22:59.000Z
Remove upstream on-by-default cloud feature gates (CloudDualStackNodeIPs, DisableKubeletCloudCredentialProviders)
diff --git a/features.md b/features.md
@@ -73,9 +73,7 @@
 | BuildCSIVolumes| <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>  |
 | CPMSMachineNamePrefix| <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>  |
 | ChunkSizeMiB| <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>  |
-| CloudDualStackNodeIPs| <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>  |
 | 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>  |
-| DisableKubeletCloudCredentialProviders| <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>  |
 | GCPLabelsTags| <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>  |
diff --git a/features/features.go b/features/features.go
@@ -187,14 +187,6 @@ var (
 					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
-	FeatureGateCloudDualStackNodeIPs = newFeatureGate("CloudDualStackNodeIPs").
-						reportProblemsToJiraComponent("machine-config-operator/platform-baremetal").
-						contactPerson("mkowalsk").
-						productScope(kubernetes).
-						enhancementPR("https://github.com/kubernetes/enhancements/issues/3705").
-						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
-
 	FeatureGateVSphereHostVMGroupZonal = newFeatureGate("VSphereHostVMGroupZonal").
 						reportProblemsToJiraComponent("splat").
 						contactPerson("jcpowermac").
@@ -378,20 +370,12 @@ var (
 					mustRegister()
 
 	FeatureGateManagedBootImagesvSphere = newFeatureGate("ManagedBootImagesvSphere").
-					reportProblemsToJiraComponent("MachineConfigOperator").
-					contactPerson("rsaini").
-					productScope(ocpSpecific).
-					enhancementPR("https://github.com/openshift/enhancements/pull/1496").
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
-
-	FeatureGateDisableKubeletCloudCredentialProviders = newFeatureGate("DisableKubeletCloudCredentialProviders").
-								reportProblemsToJiraComponent("cloud-provider").
-								contactPerson("jspeed").
-								productScope(kubernetes).
-								enhancementPR("https://github.com/kubernetes/enhancements/issues/2395").
-								enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-								mustRegister()
+						reportProblemsToJiraComponent("MachineConfigOperator").
+						contactPerson("rsaini").
+						productScope(ocpSpecific).
+						enhancementPR("https://github.com/openshift/enhancements/pull/1496").
+						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+						mustRegister()
 
 	FeatureGateOnClusterBuild = newFeatureGate("OnClusterBuild").
 					reportProblemsToJiraComponent("MachineConfigOperator").
@@ -475,13 +459,13 @@ var (
 				mustRegister()
 
 	FeatureGateExternalOIDCWithAdditionalClaimMappings = newFeatureGate("ExternalOIDCWithUIDAndExtraClaimMappings").
-				reportProblemsToJiraComponent("authentication").
-				contactPerson("bpalmer").
-				productScope(ocpSpecific).
-				enhancementPR("https://github.com/openshift/enhancements/pull/1777").
-				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				enableForClusterProfile(Hypershift, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
+								reportProblemsToJiraComponent("authentication").
+								contactPerson("bpalmer").
+								productScope(ocpSpecific).
+								enhancementPR("https://github.com/openshift/enhancements/pull/1777").
+								enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+								enableForClusterProfile(Hypershift, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+								mustRegister()
 
 	FeatureGateExample = newFeatureGate("Example").
 				reportProblemsToJiraComponent("cluster-config").
@@ -532,12 +516,12 @@ var (
 							mustRegister()
 
 	FeatureGateNewOLMOwnSingleNamespace = newFeatureGate("NewOLMOwnSingleNamespace").
-				reportProblemsToJiraComponent("olm").
-				contactPerson("nschieder").
-				productScope(ocpSpecific).
-				enhancementPR("https://github.com/openshift/enhancements/pull/1774").
-				enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
+						reportProblemsToJiraComponent("olm").
+						contactPerson("nschieder").
+						productScope(ocpSpecific).
+						enhancementPR("https://github.com/openshift/enhancements/pull/1774").
+						enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+						mustRegister()
 
 	FeatureGateInsightsOnDemandDataGather = newFeatureGate("InsightsOnDemandDataGather").
 						reportProblemsToJiraComponent("insights").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -231,15 +231,9 @@
                     {
                         "name": "ChunkSizeMiB"
                     },
-                    {
-                        "name": "CloudDualStackNodeIPs"
-                    },
                     {
                         "name": "ConsolePluginContentSecurityPolicy"
                     },
-                    {
-                        "name": "DisableKubeletCloudCredentialProviders"
-                    },
                     {
                         "name": "ExternalOIDC"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -86,9 +86,6 @@
                     {
                         "name": "ChunkSizeMiB"
                     },
-                    {
-                        "name": "CloudDualStackNodeIPs"
-                    },
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
@@ -104,9 +101,6 @@
                     {
                         "name": "DNSNameResolver"
                     },
-                    {
-                        "name": "DisableKubeletCloudCredentialProviders"
-                    },
                     {
                         "name": "DualReplica"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -104,9 +104,6 @@
                     {
                         "name": "ChunkSizeMiB"
                     },
-                    {
-                        "name": "CloudDualStackNodeIPs"
-                    },
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
@@ -119,9 +116,6 @@
                     {
                         "name": "DNSNameResolver"
                     },
-                    {
-                        "name": "DisableKubeletCloudCredentialProviders"
-                    },
                     {
                         "name": "DyanmicServiceEndpointIBMCloud"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -231,15 +231,9 @@
                     {
                         "name": "ChunkSizeMiB"
                     },
-                    {
-                        "name": "CloudDualStackNodeIPs"
-                    },
                     {
                         "name": "ConsolePluginContentSecurityPolicy"
                     },
-                    {
-                        "name": "DisableKubeletCloudCredentialProviders"
-                    },
                     {
                         "name": "GCPLabelsTags"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -74,9 +74,6 @@
                     {
                         "name": "ChunkSizeMiB"
                     },
-                    {
-                        "name": "CloudDualStackNodeIPs"
-                    },
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
@@ -92,9 +89,6 @@
                     {
                         "name": "DNSNameResolver"
                     },
-                    {
-                        "name": "DisableKubeletCloudCredentialProviders"
-                    },
                     {
                         "name": "DualReplica"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -92,9 +92,6 @@
                     {
                         "name": "ChunkSizeMiB"
                     },
-                    {
-                        "name": "CloudDualStackNodeIPs"
-                    },
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
@@ -107,9 +104,6 @@
                     {
                         "name": "DNSNameResolver"
                     },
-                    {
-                        "name": "DisableKubeletCloudCredentialProviders"
-                    },
                     {
                         "name": "DyanmicServiceEndpointIBMCloud"
                     },

Original file line number	Diff line number	Diff line change
`@@ -231,15 +231,9 @@`
`231`	`231`	`{`
`232`	`232`	`"name": "ChunkSizeMiB"`
`233`	`233`	`},`
`234`		`- {`
`235`		`- "name": "CloudDualStackNodeIPs"`
`236`		`- },`
`237`	`234`	`{`
`238`	`235`	`"name": "ConsolePluginContentSecurityPolicy"`
`239`	`236`	`},`
`240`		`- {`
`241`		`- "name": "DisableKubeletCloudCredentialProviders"`
`242`		`- },`
`243`	`237`	`{`
`244`	`238`	`"name": "ExternalOIDC"`
`245`	`239`	`},`
Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,6 @@`
`86`	`86`	`{`
`87`	`87`	`"name": "ChunkSizeMiB"`
`88`	`88`	`},`
`89`		`- {`
`90`		`- "name": "CloudDualStackNodeIPs"`
`91`		`- },`
`92`	`89`	`{`
`93`	`90`	`"name": "ClusterAPIInstallIBMCloud"`
`94`	`91`	`},`
`@@ -104,9 +101,6 @@`
`104`	`101`	`{`
`105`	`102`	`"name": "DNSNameResolver"`
`106`	`103`	`},`
`107`		`- {`
`108`		`- "name": "DisableKubeletCloudCredentialProviders"`
`109`		`- },`
`110`	`104`	`{`
`111`	`105`	`"name": "DualReplica"`
`112`	`106`	`},`
Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,6 @@`
`104`	`104`	`{`
`105`	`105`	`"name": "ChunkSizeMiB"`
`106`	`106`	`},`
`107`		`- {`
`108`		`- "name": "CloudDualStackNodeIPs"`
`109`		`- },`
`110`	`107`	`{`
`111`	`108`	`"name": "ClusterAPIInstallIBMCloud"`
`112`	`109`	`},`
`@@ -119,9 +116,6 @@`
`119`	`116`	`{`
`120`	`117`	`"name": "DNSNameResolver"`
`121`	`118`	`},`
`122`		`- {`
`123`		`- "name": "DisableKubeletCloudCredentialProviders"`
`124`		`- },`
`125`	`119`	`{`
`126`	`120`	`"name": "DyanmicServiceEndpointIBMCloud"`
`127`	`121`	`},`
Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,6 @@`
`74`	`74`	`{`
`75`	`75`	`"name": "ChunkSizeMiB"`
`76`	`76`	`},`
`77`		`- {`
`78`		`- "name": "CloudDualStackNodeIPs"`
`79`		`- },`
`80`	`77`	`{`
`81`	`78`	`"name": "ClusterAPIInstallIBMCloud"`
`82`	`79`	`},`
`@@ -92,9 +89,6 @@`
`92`	`89`	`{`
`93`	`90`	`"name": "DNSNameResolver"`
`94`	`91`	`},`
`95`		`- {`
`96`		`- "name": "DisableKubeletCloudCredentialProviders"`
`97`		`- },`
`98`	`92`	`{`
`99`	`93`	`"name": "DualReplica"`
`100`	`94`	`},`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,6 @@`
`92`	`92`	`{`
`93`	`93`	`"name": "ChunkSizeMiB"`
`94`	`94`	`},`
`95`		`- {`
`96`		`- "name": "CloudDualStackNodeIPs"`
`97`		`- },`
`98`	`95`	`{`
`99`	`96`	`"name": "ClusterAPIInstallIBMCloud"`
`100`	`97`	`},`
`@@ -107,9 +104,6 @@`
`107`	`104`	`{`
`108`	`105`	`"name": "DNSNameResolver"`
`109`	`106`	`},`
`110`		`- {`
`111`		`- "name": "DisableKubeletCloudCredentialProviders"`
`112`		`- },`
`113`	`107`	`{`
`114`	`108`	`"name": "DyanmicServiceEndpointIBMCloud"`
`115`	`109`	`},`