Merge pull request #2552 from alebedev87/dcm-back-to-dp

openshift-merge-bot[bot] · web-flow · commit 1b67472a2ba8 · 2025-10-28T22:12:38.000Z
OCPBUGS-62987: Move DynamicConfigurationManager back to DevPreview
diff --git a/features.md b/features.md
@@ -9,6 +9,7 @@
 | ClusterAPIMachineManagementVSphere| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | Example2| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | ExternalSnapshotMetadata| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
+| IngressControllerDynamicConfigurationManager| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | NewOLMCatalogdAPIV1Metas| | | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span>  |
 | NewOLMOwnSingleNamespace| | | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span>  |
 | NewOLMPreflightPermissionChecks| | | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span>  |
@@ -46,7 +47,6 @@
 | GCPDualStackInstall| | | <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>  |
 | ImageModeStatusReporting| | | <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>  |
 | ImageStreamImportMode| | | <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>  |
-| IngressControllerDynamicConfigurationManager| | | <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>  |
 | InsightsConfig| | | <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>  |
 | InsightsOnDemandDataGather| | | <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>  |
 | IrreconcilableMachineConfig| | | <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
@@ -624,7 +624,7 @@ var (
 								contactPerson("miciah").
 								productScope(ocpSpecific).
 								enhancementPR(legacyFeatureGateWithoutEnhancement).
-								enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+								enableIn(configv1.DevPreviewNoUpgrade).
 								mustRegister()
 
 	FeatureGateMinimumKubeletVersion = newFeatureGate("MinimumKubeletVersion").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -32,6 +32,9 @@
                     {
                         "name": "ExternalSnapshotMetadata"
                     },
+                    {
+                        "name": "IngressControllerDynamicConfigurationManager"
+                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
@@ -196,9 +199,6 @@
                     {
                         "name": "ImageVolume"
                     },
-                    {
-                        "name": "IngressControllerDynamicConfigurationManager"
-                    },
                     {
                         "name": "InsightsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -32,6 +32,9 @@
                     {
                         "name": "ExternalSnapshotMetadata"
                     },
+                    {
+                        "name": "IngressControllerDynamicConfigurationManager"
+                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
@@ -178,9 +181,6 @@
                     {
                         "name": "ImageVolume"
                     },
-                    {
-                        "name": "IngressControllerDynamicConfigurationManager"
-                    },
                     {
                         "name": "InsightsConfig"
                     },

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@`
`32`	`32`	`{`
`33`	`33`	`"name": "ExternalSnapshotMetadata"`
`34`	`34`	`},`
	`35`	`+ {`
	`36`	`+ "name": "IngressControllerDynamicConfigurationManager"`
	`37`	`+ },`
`35`	`38`	`{`
`36`	`39`	`"name": "MachineAPIOperatorDisableMachineHealthCheckController"`
`37`	`40`	`},`
`@@ -196,9 +199,6 @@`
`196`	`199`	`{`
`197`	`200`	`"name": "ImageVolume"`
`198`	`201`	`},`
`199`		`- {`
`200`		`- "name": "IngressControllerDynamicConfigurationManager"`
`201`		`- },`
`202`	`202`	`{`
`203`	`203`	`"name": "InsightsConfig"`
`204`	`204`	`},`