From 3caf02d8cec664d78f57621e5055f70bd6480192 Mon Sep 17 00:00:00 2001
From: Todd Short <todd.short@me.com>
Date: Wed, 22 Oct 2025 14:31:02 -0400
Subject: [PATCH] UPSTREAM: <carry>: Update to new feature-gate options in helm

Signed-off-by: Todd Short <todd.short@me.com>
---
 openshift/helm/experimental.yaml              | 32 ++++++++++---------
 .../manifests-experimental.yaml               |  3 ++
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/openshift/helm/experimental.yaml b/openshift/helm/experimental.yaml
index 092a40af1..74c724c9a 100644
--- a/openshift/helm/experimental.yaml
+++ b/openshift/helm/experimental.yaml
@@ -2,24 +2,26 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+options:
 # List of enabled experimental features for operator-controller
-# Use with {{- if has "FeatureGate" .Value.operatorControllerFeatures }}
+# Use with {{- if has "FeatureGate" .Value.operatorController.features.enabled }}
 # to pull in resources or additions
-operatorControllerFeatures:
-  - WebhookProviderOpenshiftServiceCA
-  - SingleOwnNamespaceInstallSupport
-  - PreflightPermissions
-
-# Not yet supported
-#  - HelmChartSupport
-#  - BoxcutterRuntime
-
+  operatorController:
+    features:
+      enabled:
+      - WebhookProviderOpenshiftServiceCA
+      - SingleOwnNamespaceInstallSupport
+      - PreflightPermissions
+      disabled:
+      - WebhookProviderCertManager
+      - HelmChartSupport
+      - BoxcutterRuntime
 # List of enabled experimental features for catalogd
-# Use with {{- if has "FeatureGate" .Value.catalogdFeatures }}
+# Use with {{- if has "FeatureGate" .Value.catalogd.features.enabled }}
 # to pull in resources or additions
-catalogdFeatures:
-  - APIV1MetasHandler
-
+  catalogd:
+    features:
+      enabled:
+        - APIV1MetasHandler
 # This can be one of: standard or experimental
-options:
   featureSet: experimental
diff --git a/openshift/operator-controller/manifests-experimental.yaml b/openshift/operator-controller/manifests-experimental.yaml
index a64dab908..1ccaeba33 100644
--- a/openshift/operator-controller/manifests-experimental.yaml
+++ b/openshift/operator-controller/manifests-experimental.yaml
@@ -1320,6 +1320,9 @@ spec:
             - --feature-gates=WebhookProviderOpenshiftServiceCA=true
             - --feature-gates=SingleOwnNamespaceInstallSupport=true
             - --feature-gates=PreflightPermissions=true
+            - --feature-gates=WebhookProviderCertManager=false
+            - --feature-gates=HelmChartSupport=false
+            - --feature-gates=BoxcutterRuntime=false
             - --tls-cert=/var/certs/tls.crt
             - --tls-key=/var/certs/tls.key
             - --catalogd-cas-dir=/var/ca-certs