diff --git a/features.md b/features.md index c8104b952de..8179ba45245 100644 --- a/features.md +++ b/features.md @@ -28,6 +28,7 @@ | NewOLMOwnSingleNamespace| | | | Enabled | | | | Enabled | | NewOLMPreflightPermissionChecks| | | | Enabled | | | | Enabled | | NoRegistryClusterInstall| | | | Enabled | | | | Enabled | +| OLMLifecycleAndCompatibility| | | | Enabled | | | | Enabled | | ProvisioningRequestAvailable| | | Enabled | Enabled | | | | | | AWSClusterHostedDNS| | | Enabled | Enabled | | | Enabled | Enabled | | AWSDedicatedHosts| | | Enabled | Enabled | | | Enabled | Enabled | @@ -84,7 +85,6 @@ | NewOLMWebhookProviderOpenshiftServiceCA| | Enabled | | Enabled | | Enabled | | Enabled | | NoOverlayMode| | | Enabled | Enabled | | | Enabled | Enabled | | NutanixMultiSubnets| | | Enabled | Enabled | | | Enabled | Enabled | -| OLMLifecycleAndCompatibility| | Enabled | | Enabled | | Enabled | | Enabled | | OVNObservability| | | Enabled | Enabled | | | Enabled | Enabled | | OnPremDNSRecords| | | Enabled | Enabled | | | Enabled | Enabled | | SELinuxMount| | | Enabled | Enabled | | | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index afdcef92b40..e59194f9d45 100644 --- a/features/features.go +++ b/features/features.go @@ -469,7 +469,7 @@ var ( contactPerson("joelanford"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/1991"). - enable(inDefault(), inOKD(), inClusterProfile(SelfManaged), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). + enable(inClusterProfile(SelfManaged), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() FeatureGateInsightsOnDemandDataGather = newFeatureGate("InsightsOnDemandDataGather"). diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml index 4b99d009a02..082b2828c9c 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -254,6 +254,9 @@ { "name": "NutanixMultiSubnets" }, + { + "name": "OLMLifecycleAndCompatibility" + }, { "name": "OVNObservability" }, @@ -358,9 +361,6 @@ { "name": "NewOLMWebhookProviderOpenshiftServiceCA" }, - { - "name": "OLMLifecycleAndCompatibility" - }, { "name": "OSStreams" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml index a8b61f4ea44..11dff7effe4 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -256,6 +256,9 @@ { "name": "NutanixMultiSubnets" }, + { + "name": "OLMLifecycleAndCompatibility" + }, { "name": "OVNObservability" }, @@ -360,9 +363,6 @@ { "name": "NewOLMWebhookProviderOpenshiftServiceCA" }, - { - "name": "OLMLifecycleAndCompatibility" - }, { "name": "OSStreams" },