diff --git a/features.md b/features.md index c78d402696a..7e96af7350e 100644 --- a/features.md +++ b/features.md @@ -67,7 +67,6 @@ | GCPDualStackInstall| | | Enabled | Enabled | | | Enabled | Enabled | | HyperShiftOnlyDynamicResourceAllocation| Enabled | | Enabled | | Enabled | | Enabled | | | ImageModeStatusReporting| | | Enabled | Enabled | | | Enabled | Enabled | -| IngressComponentRouteLabels| | | Enabled | Enabled | | | Enabled | Enabled | | IngressControllerDynamicConfigurationManager| | | Enabled | Enabled | | | Enabled | Enabled | | IngressControllerMultipleHAProxyVersions| | | Enabled | Enabled | | | Enabled | Enabled | | IrreconcilableMachineConfig| | | Enabled | Enabled | | | Enabled | Enabled | @@ -94,6 +93,7 @@ | VSphereConfigurableMaxAllowedBlockVolumesPerNode| | | Enabled | Enabled | | | Enabled | Enabled | | VSphereMultiVCenterDay2| | | Enabled | Enabled | | | Enabled | Enabled | | VolumeGroupSnapshot| | | Enabled | Enabled | | | Enabled | Enabled | +| IngressComponentRouteLabels| Enabled | Enabled | Enabled | Enabled | | | Enabled | Enabled | | OSStreams| | Enabled | Enabled | Enabled | | Enabled | Enabled | Enabled | | AWSClusterHostedDNSInstall| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | AWSServiceLBNetworkSecurityGroup| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index b45bef77056..c7148fe05bf 100644 --- a/features/features.go +++ b/features/features.go @@ -671,7 +671,7 @@ var ( contactPerson("leoli"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/2033"). - enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()). + enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade(), inDefault()). mustRegister() FeatureGateIngressControllerMultipleHAProxyVersions = newFeatureGate("IngressControllerMultipleHAProxyVersions"). diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index 2873fff0258..6b31cdded57 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -155,9 +155,6 @@ { "name": "ImageModeStatusReporting" }, - { - "name": "IngressComponentRouteLabels" - }, { "name": "IngressControllerDynamicConfigurationManager" }, @@ -337,6 +334,9 @@ { "name": "ImageStreamImportMode" }, + { + "name": "IngressComponentRouteLabels" + }, { "name": "InsightsConfig" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml index d3ec99985fc..6e57125dd82 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -158,9 +158,6 @@ { "name": "ImageModeStatusReporting" }, - { - "name": "IngressComponentRouteLabels" - }, { "name": "IngressControllerDynamicConfigurationManager" }, @@ -328,6 +325,9 @@ { "name": "ImageStreamImportMode" }, + { + "name": "IngressComponentRouteLabels" + }, { "name": "InsightsConfig" },