UPSTREAM: <carry>: Update to new feature-gate options in helm

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

openshift/catalogd/manifests-experimental.yaml

@@ -860,6 +860,7 @@ spec:
             - --leader-elect
             - --metrics-bind-address=:7443
             - --external-address=catalogd-service.openshift-catalogd.svc
+            - --feature-gates=APIV1MetasHandler=true
             - --tls-cert=/var/certs/tls.crt
             - --tls-key=/var/certs/tls.key
             - --v=${LOG_VERBOSITY}

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

openshift/operator-controller/manifests-experimental.yaml

@@ -1322,6 +1322,12 @@ spec:
             - --health-probe-bind-address=:8081
             - --metrics-bind-address=:8443
             - --leader-elect
+            - --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