WIP: use a list of feature-gates

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

Author: tmshort

helm/experimental.yaml

@@ -2,17 +2,20 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-features:
-  apiV1MetasHandler:
-    enabled: true
-  webhookProviderCertManager:
-    enabled: true
-  singleOwnNamespaceInstallSupport:
-    enabled: true
-  preflightPermissions:
-    enabled: true
-  helmChartSupport:
-    enabled: true
+# List of enabled experimental features for operator-controller
+# Use with {{- if has "FeatureGate" .Value.operatorControllerFeatures }}
+# to pull in resources or additions
+operatorControllerFeatures:
+  - WebhookProviderCertManager
+  - SingleOwnNamespaceInstallSupport
+  - PreflightPermissions
+  - HelmChartSupport
+
+# List of enabled experimental features for catalogd
+# Use with {{- if has "FeatureGate" .Value.catalogdFeatures }}
+# to pull in resources or additions
+catalogdFeatures:
+  - APIV1MetasHandler
 
 # This can be one of: standard or experimental
 featureSet: experimental

helm/olmv1/templates/29-deployment-olmv1-system-catalogd-controller-manager.yml

@@ -35,13 +35,13 @@ spec:
     spec:
       containers:
         - args:
-            {{- if not .Values.features.tilt.enabled }}
+            {{- if not .Values.tilt.enabled }}
             - --leader-elect
             {{- end }}
             - --metrics-bind-address=:7443
             - --external-address=catalogd-service.{{ .Values.namespaces.olmv1.name }}.svc
-            {{- if .Values.features.apiV1MetasHandler.enabled }}
-            - --feature-gates=APIV1MetasHandler=true
+            {{- range .Values.catalogdFeatures }}
+            - --feature-gates={{- . -}}=true
             {{- end }}
             {{- if .Values.components.certManager.enabled }}
             - --tls-cert=/var/certs/tls.crt
@@ -64,7 +64,7 @@ spec:
           {{- toYamlPretty . | nindent 12 }}
           {{- end }}
           image: "{{ .Values.components.catalogd.deployment.image }}"
-          {{- if not .Values.features.tilt.enabled }}
+          {{- if not .Values.tilt.enabled }}
           livenessProbe:
             httpGet:
               path: /healthz
@@ -73,7 +73,7 @@ spec:
             periodSeconds: 20
           {{- end }}
           name: manager
-          {{- if not .Values.features.tilt.enabled }}
+          {{- if not .Values.tilt.enabled }}
           readinessProbe:
             httpGet:
               path: /readyz

helm/olmv1/templates/30-deployment-olmv1-system-operator-controller-controller-manager.yml

@@ -36,20 +36,11 @@ spec:
         - args:
             - --health-probe-bind-address=:8081
             - --metrics-bind-address=:8443
-            {{- if not .Values.features.tilt.enabled }}
+            {{- if not .Values.tilt.enabled }}
             - --leader-elect
             {{- end }}
-            {{- if .Values.features.apiV1MetasHandler.enabled }}
-            - --feature-gates=WebhookProviderCertManager=true
-            {{- end }}
-            {{- if .Values.features.singleOwnNamespaceInstallSupport.enabled }}
-            - --feature-gates=SingleOwnNamespaceInstallSupport=true
-            {{- end }}
-            {{- if .Values.features.preflightPermissions.enabled }}
-            - --feature-gates=PreflightPermissions=true
-            {{- end }}
-            {{- if .Values.features.helmChartSupport.enabled }}
-            - --feature-gates=HelmChartSupport=true
+            {{- range .Values.operatorControllerFeatures }}
+            - --feature-gates={{- . -}}=true
             {{- end }}
             {{- if .Values.components.certManager.enabled }}
             - --catalogd-cas-dir=/var/ca-certs
@@ -73,7 +64,7 @@ spec:
           {{- toYamlPretty . | nindent 12 }}
           {{- end }}
           image: "{{ .Values.components.operatorController.deployment.image }}"
-          {{- if not .Values.features.tilt.enabled }}
+          {{- if not .Values.tilt.enabled }}
           livenessProbe:
             httpGet:
               path: /healthz
@@ -82,7 +73,7 @@ spec:
             periodSeconds: 20
           {{- end }}
           name: manager
-          {{- if not .Values.features.tilt.enabled }}
+          {{- if not .Values.tilt.enabled }}
           readinessProbe:
             httpGet:
               path: /readyz

helm/olmv1/values.yaml

@@ -41,19 +41,12 @@ components:
   e2e:
     enabled: false
 
-features:
-  tilt:
-    enabled: false
-  apiV1MetasHandler:
-    enabled: false
-  webhookProviderCertManager:
-    enabled: false
-  singleOwnNamespaceInstallSupport:
-    enabled: false
-  preflightPermissions:
-    enabled: false
-  helmChartSupport:
-    enabled: false
+      
+tilt:
+  enabled: false
+
+operatorControllerFeatures: []
+catalogdFeatures: []
 
 # This can be one of: standard or experimental
 featureSet: standard

helm/tilt.yaml

@@ -2,19 +2,17 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-features:
-  tilt:
-    enabled: true
-  apiV1MetasHandler:
-    enabled: true
-  webhookProviderCertManager:
-    enabled: true
-  singleOwnNamespaceInstallSupport:
-    enabled: true
-  preflightPermissions:
-    enabled: true
-  helmChartSupport:
-    enabled: true
+tilt:
+  enabled: true
+
+operatorControllerFeatures:
+  - WebhookProviderCertManager
+  - SingleOwnNamespaceInstallSupport
+  - PreflightPermissions
+  - HelmChartSupport
+
+catalogdFeatures:
+  - APIV1MetasHandler
 
 # This can be one of: standard or experimental
 featureSet: experimental