From 76b520cbb96f0bdf094231fbb67a879e59fb3914 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 6b21a4ae5d6..725d4aa0e6e 100644 --- a/features.md +++ b/features.md @@ -10,7 +10,7 @@ | ClusterAPIMachineManagementVSphere| | | Enabled | Enabled | | | | | | Example2| | | Enabled | Enabled | | | | | | ExternalSnapshotMetadata| | | Enabled | Enabled | | | | | -| IngressControllerDynamicConfigurationManager| | | Enabled | Enabled | | | | | +| IngressControllerDynamicConfigurationManager| | | Enabled | Enabled | | | Enabled | Enabled | | NetworkConnect| | | Enabled | Enabled | | | | | | NewOLMCatalogdAPIV1Metas| | | | Enabled | | | | Enabled | | NewOLMOwnSingleNamespace| | | | Enabled | | | | Enabled | diff --git a/features/features.go b/features/features.go index 660e5758b6f..a5968fea511 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 6880fa3e6b6..0023d40d859 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" }, @@ -211,6 +208,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 9c68cf67d44..92873680a7c 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" }, @@ -193,6 +190,9 @@ { "name": "ImageVolume" }, + { + "name": "IngressControllerDynamicConfigurationManager" + }, { "name": "InsightsConfig" }, From c2174d0c9301000b2dab5d904ebc491929943461 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.md | 2 +- features/features.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/features.md b/features.md index 725d4aa0e6e..96ba3706537 100644 --- a/features.md +++ b/features.md @@ -10,7 +10,6 @@ | ClusterAPIMachineManagementVSphere| | | Enabled | Enabled | | | | | | Example2| | | Enabled | Enabled | | | | | | ExternalSnapshotMetadata| | | Enabled | Enabled | | | | | -| IngressControllerDynamicConfigurationManager| | | Enabled | Enabled | | | Enabled | Enabled | | NetworkConnect| | | Enabled | Enabled | | | | | | NewOLMCatalogdAPIV1Metas| | | | Enabled | | | | Enabled | | NewOLMOwnSingleNamespace| | | | Enabled | | | | Enabled | @@ -48,6 +47,7 @@ | GCPDualStackInstall| | | Enabled | Enabled | | | Enabled | Enabled | | HyperShiftOnlyDynamicResourceAllocation| 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 a5968fea511..8d7fcf79adc 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()