diff --git a/features.md b/features.md index 5259884ec63..5738bc25e2f 100644 --- a/features.md +++ b/features.md @@ -61,7 +61,6 @@ | GCPDualStackInstall| | | Enabled | Enabled | | | Enabled | Enabled | | GatewayAPIWithoutOLM| | | Enabled | Enabled | | | Enabled | Enabled | | HyperShiftOnlyDynamicResourceAllocation| Enabled | | Enabled | | Enabled | | Enabled | | -| ImageModeStatusReporting| | | Enabled | Enabled | | | Enabled | Enabled | | IngressControllerDynamicConfigurationManager| | | Enabled | Enabled | | | Enabled | Enabled | | IrreconcilableMachineConfig| | | Enabled | Enabled | | | Enabled | Enabled | | KMSEncryption| | | Enabled | Enabled | | | Enabled | Enabled | @@ -95,6 +94,7 @@ | GatewayAPI| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | GatewayAPIController| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | HighlyAvailableArbiter| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | +| ImageModeStatusReporting| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | ImageStreamImportMode| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | ImageVolume| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | InsightsConfig| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 3ba5f3113e9..b5d0375160b 100644 --- a/features/features.go +++ b/features/features.go @@ -270,7 +270,7 @@ var ( contactPerson("ijanssen"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/1809"). - enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). + enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() FeatureGateClusterAPIInstall = newFeatureGate("ClusterAPIInstall"). diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index db59d186a29..8b69d481860 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -164,9 +164,6 @@ { "name": "GatewayAPIWithoutOLM" }, - { - "name": "ImageModeStatusReporting" - }, { "name": "IngressControllerDynamicConfigurationManager" }, @@ -301,6 +298,9 @@ { "name": "HyperShiftOnlyDynamicResourceAllocation" }, + { + "name": "ImageModeStatusReporting" + }, { "name": "ImageStreamImportMode" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml index 332c549cafa..36c904d229e 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -166,9 +166,6 @@ { "name": "GatewayAPIWithoutOLM" }, - { - "name": "ImageModeStatusReporting" - }, { "name": "IngressControllerDynamicConfigurationManager" }, @@ -303,6 +300,9 @@ { "name": "HyperShiftOnlyDynamicResourceAllocation" }, + { + "name": "ImageModeStatusReporting" + }, { "name": "ImageStreamImportMode" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml index 72e73eb4233..c72b3b3a8f1 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -167,9 +167,6 @@ { "name": "HyperShiftOnlyDynamicResourceAllocation" }, - { - "name": "ImageModeStatusReporting" - }, { "name": "IngressControllerDynamicConfigurationManager" }, @@ -292,6 +289,9 @@ { "name": "HighlyAvailableArbiter" }, + { + "name": "ImageModeStatusReporting" + }, { "name": "ImageStreamImportMode" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml index 7f29f0d1a1a..d30396a07c6 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -169,9 +169,6 @@ { "name": "HyperShiftOnlyDynamicResourceAllocation" }, - { - "name": "ImageModeStatusReporting" - }, { "name": "IngressControllerDynamicConfigurationManager" }, @@ -294,6 +291,9 @@ { "name": "HighlyAvailableArbiter" }, + { + "name": "ImageModeStatusReporting" + }, { "name": "ImageStreamImportMode" },