WIP: pull rbac/webhooks back into templates

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

Author: tmshort

helm/olmv1/base/catalogd/rbac/standard/role.yaml

@@ -1,7 +1,23 @@
 {{- if .Values.components.catalogd.enabled }}
-{{- if (eq .Values.featureSet "standard") }}
-{{ tpl (.Files.Get "base/catalogd/rbac/standard/role.yaml") . }}
-{{- else if (eq .Values.featureSet "experimental") }}
-{{ tpl (.Files.Get "base/catalogd/rbac/experimental/role.yaml") . }}
-{{- end }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: catalogd-manager-role
+  namespace: {{ .Values.namespaces.olmv1.name }}
+  labels:
+    app.kubernetes.io/name: catalogd
+    {{- include "olmv1.labels" . | nindent 4 }}
+  annotations:
+    {{- include "olmv1.annotations" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+      - serviceaccounts
+    verbs:
+      - get
+      - list
+      - watch
+  {{- include "olmv1.catalogd.role.rules" . | nindent 2 }}
 {{- end }}

helm/olmv1/base/catalogd/webhook/experimental/manifests.yaml

@@ -1,7 +1,35 @@
 {{- if .Values.components.operatorController.enabled }}
-{{- if (eq .Values.featureSet "standard") }}
-{{ tpl (.Files.Get "base/operator-controller/rbac/standard/role.yaml") . }}
-{{- else if (eq .Values.featureSet "experimental") }}
-{{ tpl (.Files.Get "base/operator-controller/rbac/experimental/role.yaml") . }}
-{{- end }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: operator-controller-manager-role
+  namespace: {{ .Values.namespaces.olmv1.name }}
+  labels:
+    app.kubernetes.io/name: operator-controller
+    {{- include "olmv1.labels" . | nindent 4 }}
+  annotations:
+    {{- include "olmv1.annotations" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+    verbs:
+      - create
+      - delete
+      - deletecollection
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - serviceaccounts
+    verbs:
+      - get
+      - list
+      - watch
+  {{- include "olmv1.operatorController.role.rules" . | nindent 2 }}
 {{- end }}

helm/olmv1/base/catalogd/webhook/standard/manifests.yaml

@@ -1,4 +1,4 @@
----
+{{- if .Values.components.catalogd.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -36,25 +36,4 @@ rules:
       - patch
       - update
   {{- include "olmv1.catalogd.clusterRole.rules" . | nindent 2 }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: catalogd-manager-role
-  namespace: {{ .Values.namespaces.olmv1.name }}
-  labels:
-    app.kubernetes.io/name: catalogd
-    {{- include "olmv1.labels" . | nindent 4 }}
-  annotations:
-    {{- include "olmv1.annotations" . | nindent 4 }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - secrets
-      - serviceaccounts
-    verbs:
-      - get
-      - list
-      - watch
-  {{- include "olmv1.catalogd.role.rules" . | nindent 2 }}
+{{- end }}

helm/olmv1/base/operator-controller/rbac/standard/role.yaml

@@ -1,4 +1,4 @@
----
+{{- if .Values.components.operatorController.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -63,37 +63,4 @@ rules:
       - list
       - watch
   {{- include "olmv1.operatorController.clusterRole.rules" . | nindent 2 }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: operator-controller-manager-role
-  namespace: {{ .Values.namespaces.olmv1.name }}
-  labels:
-    app.kubernetes.io/name: operator-controller
-    {{- include "olmv1.labels" . | nindent 4 }}
-  annotations:
-    {{- include "olmv1.annotations" . | nindent 4 }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - secrets
-    verbs:
-      - create
-      - delete
-      - deletecollection
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - ""
-    resources:
-      - serviceaccounts
-    verbs:
-      - get
-      - list
-      - watch
-  {{- include "olmv1.operatorController.role.rules" . | nindent 2 }}
+{{- end }}