From 13d1db9b37a286af6ac03781fc4025bd33d09094 Mon Sep 17 00:00:00 2001 From: Miciah Dashiel Butler Masters Date: Thu, 11 Dec 2025 12:14:13 -0500 Subject: [PATCH 1/2] Move DynamicConfigurationManager back to TPNU Revert "OCPBUGS-62987: Move DynamicConfigurationManager back to DevPreview" This reverts commit 25db151b282f8ccad409bd6e120bfcd62875dd4d. This commit resolves OCPBUGS-67232. https://issues.redhat.com/browse/OCPBUGS-67232 --- features.md | 2 +- features/features.go | 2 +- .../featureGate-Hypershift-TechPreviewNoUpgrade.yaml | 6 +++--- .../featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/features.md b/features.md index 75f489acafc..6d21a6f3a58 100644 --- a/features.md +++ b/features.md @@ -10,7 +10,6 @@ | ClusterAPIMachineManagementVSphere| | | Enabled | Enabled | | | | Example2| | | Enabled | Enabled | | | | ExternalSnapshotMetadata| | | Enabled | Enabled | | | -| IngressControllerDynamicConfigurationManager| | | Enabled | Enabled | | | | NewOLMCatalogdAPIV1Metas| | | | Enabled | | Enabled | | NewOLMOwnSingleNamespace| | | | Enabled | | Enabled | | NewOLMPreflightPermissionChecks| | | | Enabled | | Enabled | @@ -49,6 +48,7 @@ | GCPCustomAPIEndpointsInstall| | | Enabled | Enabled | Enabled | Enabled | | GCPDualStackInstall| | | Enabled | Enabled | Enabled | Enabled | | ImageModeStatusReporting| | | Enabled | Enabled | Enabled | Enabled | +| IngressControllerDynamicConfigurationManager| | | Enabled | Enabled | Enabled | Enabled | | InsightsConfig| | | Enabled | Enabled | Enabled | Enabled | | InsightsOnDemandDataGather| | | Enabled | Enabled | Enabled | Enabled | | IrreconcilableMachineConfig| | | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 9cacb986fd2..192c0ed4072 100644 --- a/features/features.go +++ b/features/features.go @@ -631,7 +631,7 @@ var ( contactPerson("miciah"). productScope(ocpSpecific). enhancementPR(legacyFeatureGateWithoutEnhancement). - enableIn(configv1.DevPreviewNoUpgrade). + enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). mustRegister() FeatureGateMinimumKubeletVersion = newFeatureGate("MinimumKubeletVersion"). diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml index e3c80881325..3fecd0fcaac 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml @@ -32,9 +32,6 @@ { "name": "ExternalSnapshotMetadata" }, - { - "name": "IngressControllerDynamicConfigurationManager" - }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, @@ -208,6 +205,9 @@ { "name": "ImageVolume" }, + { + "name": "IngressControllerDynamicConfigurationManager" + }, { "name": "InsightsConfig" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml index c598cbfa831..ac29434d0bd 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -35,9 +35,6 @@ { "name": "HyperShiftOnlyDynamicResourceAllocation" }, - { - "name": "IngressControllerDynamicConfigurationManager" - }, { "name": "MachineAPIOperatorDisableMachineHealthCheckController" }, @@ -190,6 +187,9 @@ { "name": "ImageVolume" }, + { + "name": "IngressControllerDynamicConfigurationManager" + }, { "name": "InsightsConfig" }, From 845ec5ef5e49ef176ee0567fa3d6c5f3d35ecb38 Mon Sep 17 00:00:00 2001 From: Miciah Dashiel Butler Masters Date: Thu, 11 Dec 2025 15:46:40 -0500 Subject: [PATCH 2/2] Add link to the dynamic-config-manager EP PR * features/features.go (FeatureGateIngressControllerDynamicConfigurationManager): Add a link to the dynamic-config-manager enhancement proposal PR. --- features/features.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/features.go b/features/features.go index 192c0ed4072..eee30141c3f 100644 --- a/features/features.go +++ b/features/features.go @@ -630,7 +630,7 @@ var ( reportProblemsToJiraComponent("Networking/router"). contactPerson("miciah"). productScope(ocpSpecific). - enhancementPR(legacyFeatureGateWithoutEnhancement). + enhancementPR("https://github.com/openshift/enhancements/pull/1687"). enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). mustRegister()