From 2411df18de15f842f5c9825a9cea9f1ce24c55a8 Mon Sep 17 00:00:00 2001
From: Chai Bot <ship-help-github@redhat.com>
Date: Sun, 26 Jul 2026 12:22:27 +0000
Subject: [PATCH] Revert "Merge pull request #2920 from
 perdasilva/promote-olm-lifecycle-default"

This reverts commit 18550f1a6d13692eee627b2cad0880c15de07741, reversing
changes made to 356624ff036f26bd0566650396cbe4b758b28d52.
---
 features.md                                                 | 2 +-
 features/features.go                                        | 2 +-
 .../featureGate-4-10-SelfManagedHA-Default.yaml             | 6 +++---
 .../featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml    | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/features.md b/features.md
index c8104b952de..8179ba45245 100644
--- a/features.md
+++ b/features.md
@@ -28,6 +28,7 @@
 | NewOLMOwnSingleNamespace| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
 | NewOLMPreflightPermissionChecks| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
 | NoRegistryClusterInstall| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
+| OLMLifecycleAndCompatibility| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
 | ProvisioningRequestAvailable| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
 | AWSClusterHostedDNS| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | AWSDedicatedHosts| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
@@ -84,7 +85,6 @@
 | NewOLMWebhookProviderOpenshiftServiceCA| | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span>  |
 | NoOverlayMode| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | NutanixMultiSubnets| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
-| OLMLifecycleAndCompatibility| | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span>  |
 | OVNObservability| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | OnPremDNSRecords| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | SELinuxMount| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
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"
                     },