WIP: change featureSet definition

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

Author: tmshort

helm/experimental-e2e.yaml

@@ -19,5 +19,5 @@ features:
   helmChartSupport:
     enabled: true
 
-# This can be one of: standard, standard-e2e, experimental, or experimental-e2e
-featureSet: experimental-e2e
+# This can be one of: standard or experimental
+featureSet: experimental

helm/experimental.yaml

@@ -14,5 +14,5 @@ features:
   helmChartSupport:
     enabled: true
 
-# This can be one of: standard, standard-e2e, experimental, or experimental-e2e
+# This can be one of: standard or experimental
 featureSet: experimental

helm/olmv1/templates/01-customresourcedefinition-clustercatalogs.olm.operatorframework.io.yml

@@ -1,8 +1,7 @@
 {{- if .Values.components.catalogd.enabled }}
-{{- if or (eq .Values.featureSet "standard") (eq .Values.featureSet "standard-e2e") }}
+{{- if (eq .Values.featureSet "standard") }}
 {{ tpl (.Files.Get "base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml") . }}
-{{- end }}
-{{- if or (eq .Values.featureSet "experimental") (eq .Values.featureSet "experimental-e2e") }}
+{{- else if (eq .Values.featureSet "experimental") }}
 {{ tpl (.Files.Get "base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml") . }}
 {{- end }}
 {{- end }}

helm/olmv1/templates/02-customresourcedefinition-clusterextensions.olm.operatorframework.io.yml

@@ -1,8 +1,7 @@
 {{- if .Values.components.operatorController.enabled }}
-{{- if or (eq .Values.featureSet "standard") (eq .Values.featureSet "standard-e2e") }}
+{{- if (eq .Values.featureSet "standard") }}
 {{ tpl (.Files.Get "base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml") . }}
-{{- end }}
-{{- if or (eq .Values.featureSet "experimental") (eq .Values.featureSet "experimental-e2e") }}
+{{- else if (eq .Values.featureSet "experimental") }}
 {{ tpl (.Files.Get "base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml") . }}
 {{- end }}
 {{- end }}

helm/olmv1/templates/06-role-olmv1-system-catalogd-manager-role.yml

@@ -1,8 +1,7 @@
 {{- if .Values.components.catalogd.enabled }}
-{{- if or (eq .Values.featureSet "standard") (eq .Values.featureSet "standard-e2e") }}
+{{- if (eq .Values.featureSet "standard") }}
 {{ tpl (.Files.Get "base/catalogd/rbac/standard/role.yaml") . }}
-{{- end }}
-{{- if or (eq .Values.featureSet "experimental") (eq .Values.featureSet "experimental-e2e") }}
+{{- else if (eq .Values.featureSet "experimental") }}
 {{ tpl (.Files.Get "base/catalogd/rbac/experimental/role.yaml") . }}
 {{- end }}
 {{- end }}

helm/olmv1/templates/08-role-olmv1-system-operator-controller-manager-role.yml

@@ -1,8 +1,7 @@
 {{- if .Values.components.operatorController.enabled }}
-{{- if or (eq .Values.featureSet "standard") (eq .Values.featureSet "standard-e2e") }}
+{{- if (eq .Values.featureSet "standard") }}
 {{ tpl (.Files.Get "base/operator-controller/rbac/standard/role.yaml") . }}
-{{- end }}
-{{- if or (eq .Values.featureSet "experimental") (eq .Values.featureSet "experimental-e2e") }}
+{{- else if (eq .Values.featureSet "experimental") }}
 {{ tpl (.Files.Get "base/operator-controller/rbac/experimental/role.yaml") . }}
 {{- end }}
 {{- end }}

helm/olmv1/templates/40-mutatingwebhookconfiguration-catalogd-mutating-webhook-configuration.yml

@@ -1,8 +1,7 @@
 {{- if .Values.components.catalogd.enabled }}
-{{- if or (eq .Values.featureSet "standard") (eq .Values.featureSet "standard-e2e") }}
+{{- if (eq .Values.featureSet "standard") }}
 {{ tpl (.Files.Get "base/catalogd/webhook/standard/manifests.yaml") . }}
-{{- end }}
-{{- if or (eq .Values.featureSet "experimental") (eq .Values.featureSet "experimental-e2e") }}
+{{- else if (eq .Values.featureSet "experimental") }}
 {{ tpl (.Files.Get "base/catalogd/webhook/experimental/manifests.yaml") . }}
 {{- end }}
 {{- end }}

helm/olmv1/templates/_helpers.tpl

@@ -29,5 +29,5 @@ app.kubernetes.io/part-of: olm
 Common annoations
 */}}
 {{- define "olmv1.annotations" -}}
-olm.operatorframework.io/feature-set: {{ .Values.featureSet }}
+olm.operatorframework.io/feature-set: {{ .Values.featureSet -}}{{- if .Values.components.e2e.enabled -}}-e2e{{- end -}}
 {{- end }}

helm/olmv1/values.yaml

@@ -49,7 +49,7 @@ features:
   helmChartSupport:
     enabled: false
 
-# This can be one of: standard, standard-e2e, experimental, or experimental-e2e
+# This can be one of: standard or experimental
 featureSet: standard
 
 # The set of namespaces

helm/standard-e2e.yaml

@@ -7,5 +7,5 @@ components:
   e2e:
     enabled: true
 
-# This can be one of: standard, standard-e2e, experimental, or experimental-e2e
-featureSet: standard-e2e
+# This can be one of: standard or  experimental
+featureSet: standard