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..eee30141c3f 100644 --- a/features/features.go +++ b/features/features.go @@ -630,8 +630,8 @@ var ( reportProblemsToJiraComponent("Networking/router"). contactPerson("miciah"). productScope(ocpSpecific). - enhancementPR(legacyFeatureGateWithoutEnhancement). - enableIn(configv1.DevPreviewNoUpgrade). + enhancementPR("https://github.com/openshift/enhancements/pull/1687"). + 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" },