From f28546a17cf54a3a03b1c8b8f03ff56b1460f1bd Mon Sep 17 00:00:00 2001
From: "Per G. da Silva" <pegoncal@redhat.com>
Date: Mon, 22 Sep 2025 13:17:40 +0200
Subject: [PATCH] Promote OLMv1 Webhook support to GA

Signed-off-by: Per G. da Silva <pegoncal@redhat.com>
---
 features.md                                                 | 2 +-
 features/features.go                                        | 4 ++--
 .../featuregates/featureGate-SelfManagedHA-Default.yaml     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/features.md b/features.md
index dc792f76baf..6f5710622db 100644
--- a/features.md
+++ b/features.md
@@ -12,10 +12,10 @@
 | NewOLMCatalogdAPIV1Metas| | | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span>  |
 | 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>  |
-| NewOLMWebhookProviderOpenshiftServiceCA| | | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span>  |
 | NoRegistryClusterOperations| | | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span>  |
 | VSphereMixedNodeEnv| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | NewOLM| | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span>  |
+| NewOLMWebhookProviderOpenshiftServiceCA| | <span style="background-color: #519450">Enabled</span> | | <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>  |
 | AWSClusterHostedDNSInstall| | | <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>  |
diff --git a/features/features.go b/features/features.go
index 34f4f0a706e..3147c157ce5 100644
--- a/features/features.go
+++ b/features/features.go
@@ -521,8 +521,8 @@ var (
 								reportProblemsToJiraComponent("olm").
 								contactPerson("pegoncal").
 								productScope(ocpSpecific).
-								enhancementPR("https://github.com/openshift/enhancements/pull/1799").
-								enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+								enhancementPR("https://github.com/openshift/enhancements/pull/1844").
+								enableForClusterProfile(SelfManaged, configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 								mustRegister()
 
 	FeatureGateInsightsOnDemandDataGather = newFeatureGate("InsightsOnDemandDataGather").
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index 61081d796ae..6bf14287f2f 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -178,9 +178,6 @@
                     {
                         "name": "NewOLMPreflightPermissionChecks"
                     },
-                    {
-                        "name": "NewOLMWebhookProviderOpenshiftServiceCA"
-                    },
                     {
                         "name": "NoRegistryClusterOperations"
                     },
@@ -294,6 +291,9 @@
                     {
                         "name": "NewOLM"
                     },
+                    {
+                        "name": "NewOLMWebhookProviderOpenshiftServiceCA"
+                    },
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },