Remove clusterextension editor role

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

Author: tmshort

helm/olmv1/templates/rbac/clusterrole-operator-controller-clusterextension-editor-role.yml

@@ -1537,30 +1537,6 @@ rules:
     verbs:
       - create
 ---
-# Source: olmv1/templates/rbac/clusterrole-operator-controller-clusterextension-editor-role.yml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  annotations:
-    olm.operatorframework.io/feature-set: experimental-e2e
-  labels:
-    app.kubernetes.io/name: operator-controller
-    app.kubernetes.io/part-of: olm
-  name: operator-controller-clusterextension-editor-role
-rules:
-  - apiGroups:
-      - olm.operatorframework.io
-    resources:
-      - clusterextensions
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
----
 # Source: olmv1/templates/rbac/clusterrole-operator-controller-clusterextension-viewer-role.yml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -1665,23 +1641,23 @@ subjects:
     name: catalogd-controller-manager
     namespace: olmv1-system
 ---
-# Source: olmv1/templates/rbac/clusterrolebinding-operator-controller-manager-rolebinding.yml
+# Source: olmv1/templates/rbac/clusterrolebinding-common-proxy-rolebinding.yml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   annotations:
     olm.operatorframework.io/feature-set: experimental-e2e
   labels:
-    app.kubernetes.io/name: operator-controller
+    app.kubernetes.io/name: catalogd
     app.kubernetes.io/part-of: olm
-  name: operator-controller-manager-rolebinding
+  name: catalogd-proxy-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: cluster-admin
+  name: catalogd-proxy-role
 subjects:
   - kind: ServiceAccount
-    name: operator-controller-controller-manager
+    name: catalogd-controller-manager
     namespace: olmv1-system
 ---
 # Source: olmv1/templates/rbac/clusterrolebinding-common-proxy-rolebinding.yml
@@ -1691,19 +1667,19 @@ metadata:
   annotations:
     olm.operatorframework.io/feature-set: experimental-e2e
   labels:
-    app.kubernetes.io/name: catalogd
+    app.kubernetes.io/name: operator-controller
     app.kubernetes.io/part-of: olm
-  name: catalogd-proxy-rolebinding
+  name: operator-controller-proxy-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: catalogd-proxy-role
+  name: operator-controller-proxy-role
 subjects:
   - kind: ServiceAccount
-    name: catalogd-controller-manager
+    name: operator-controller-controller-manager
     namespace: olmv1-system
 ---
-# Source: olmv1/templates/rbac/clusterrolebinding-common-proxy-rolebinding.yml
+# Source: olmv1/templates/rbac/clusterrolebinding-operator-controller-manager-rolebinding.yml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -1712,11 +1688,11 @@ metadata:
   labels:
     app.kubernetes.io/name: operator-controller
     app.kubernetes.io/part-of: olm
-  name: operator-controller-proxy-rolebinding
+  name: operator-controller-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: operator-controller-proxy-role
+  name: cluster-admin
 subjects:
   - kind: ServiceAccount
     name: operator-controller-controller-manager

manifests/experimental-e2e.yaml

@@ -1502,30 +1502,6 @@ rules:
     verbs:
       - create
 ---
-# Source: olmv1/templates/rbac/clusterrole-operator-controller-clusterextension-editor-role.yml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  annotations:
-    olm.operatorframework.io/feature-set: experimental
-  labels:
-    app.kubernetes.io/name: operator-controller
-    app.kubernetes.io/part-of: olm
-  name: operator-controller-clusterextension-editor-role
-rules:
-  - apiGroups:
-      - olm.operatorframework.io
-    resources:
-      - clusterextensions
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
----
 # Source: olmv1/templates/rbac/clusterrole-operator-controller-clusterextension-viewer-role.yml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -1630,23 +1606,23 @@ subjects:
     name: catalogd-controller-manager
     namespace: olmv1-system
 ---
-# Source: olmv1/templates/rbac/clusterrolebinding-operator-controller-manager-rolebinding.yml
+# Source: olmv1/templates/rbac/clusterrolebinding-common-proxy-rolebinding.yml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   annotations:
     olm.operatorframework.io/feature-set: experimental
   labels:
-    app.kubernetes.io/name: operator-controller
+    app.kubernetes.io/name: catalogd
     app.kubernetes.io/part-of: olm
-  name: operator-controller-manager-rolebinding
+  name: catalogd-proxy-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: cluster-admin
+  name: catalogd-proxy-role
 subjects:
   - kind: ServiceAccount
-    name: operator-controller-controller-manager
+    name: catalogd-controller-manager
     namespace: olmv1-system
 ---
 # Source: olmv1/templates/rbac/clusterrolebinding-common-proxy-rolebinding.yml
@@ -1656,19 +1632,19 @@ metadata:
   annotations:
     olm.operatorframework.io/feature-set: experimental
   labels:
-    app.kubernetes.io/name: catalogd
+    app.kubernetes.io/name: operator-controller
     app.kubernetes.io/part-of: olm
-  name: catalogd-proxy-rolebinding
+  name: operator-controller-proxy-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: catalogd-proxy-role
+  name: operator-controller-proxy-role
 subjects:
   - kind: ServiceAccount
-    name: catalogd-controller-manager
+    name: operator-controller-controller-manager
     namespace: olmv1-system
 ---
-# Source: olmv1/templates/rbac/clusterrolebinding-common-proxy-rolebinding.yml
+# Source: olmv1/templates/rbac/clusterrolebinding-operator-controller-manager-rolebinding.yml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -1677,11 +1653,11 @@ metadata:
   labels:
     app.kubernetes.io/name: operator-controller
     app.kubernetes.io/part-of: olm
-  name: operator-controller-proxy-rolebinding
+  name: operator-controller-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: operator-controller-proxy-role
+  name: cluster-admin
 subjects:
   - kind: ServiceAccount
     name: operator-controller-controller-manager

manifests/experimental.yaml

@@ -1298,30 +1298,6 @@ rules:
     verbs:
       - create
 ---
-# Source: olmv1/templates/rbac/clusterrole-operator-controller-clusterextension-editor-role.yml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  annotations:
-    olm.operatorframework.io/feature-set: standard-e2e
-  labels:
-    app.kubernetes.io/name: operator-controller
-    app.kubernetes.io/part-of: olm
-  name: operator-controller-clusterextension-editor-role
-rules:
-  - apiGroups:
-      - olm.operatorframework.io
-    resources:
-      - clusterextensions
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
----
 # Source: olmv1/templates/rbac/clusterrole-operator-controller-clusterextension-viewer-role.yml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -1426,23 +1402,23 @@ subjects:
     name: catalogd-controller-manager
     namespace: olmv1-system
 ---
-# Source: olmv1/templates/rbac/clusterrolebinding-operator-controller-manager-rolebinding.yml
+# Source: olmv1/templates/rbac/clusterrolebinding-common-proxy-rolebinding.yml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   annotations:
     olm.operatorframework.io/feature-set: standard-e2e
   labels:
-    app.kubernetes.io/name: operator-controller
+    app.kubernetes.io/name: catalogd
     app.kubernetes.io/part-of: olm
-  name: operator-controller-manager-rolebinding
+  name: catalogd-proxy-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: operator-controller-manager-role
+  name: catalogd-proxy-role
 subjects:
   - kind: ServiceAccount
-    name: operator-controller-controller-manager
+    name: catalogd-controller-manager
     namespace: olmv1-system
 ---
 # Source: olmv1/templates/rbac/clusterrolebinding-common-proxy-rolebinding.yml
@@ -1452,19 +1428,19 @@ metadata:
   annotations:
     olm.operatorframework.io/feature-set: standard-e2e
   labels:
-    app.kubernetes.io/name: catalogd
+    app.kubernetes.io/name: operator-controller
     app.kubernetes.io/part-of: olm
-  name: catalogd-proxy-rolebinding
+  name: operator-controller-proxy-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: catalogd-proxy-role
+  name: operator-controller-proxy-role
 subjects:
   - kind: ServiceAccount
-    name: catalogd-controller-manager
+    name: operator-controller-controller-manager
     namespace: olmv1-system
 ---
-# Source: olmv1/templates/rbac/clusterrolebinding-common-proxy-rolebinding.yml
+# Source: olmv1/templates/rbac/clusterrolebinding-operator-controller-manager-rolebinding.yml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -1473,11 +1449,11 @@ metadata:
   labels:
     app.kubernetes.io/name: operator-controller
     app.kubernetes.io/part-of: olm
-  name: operator-controller-proxy-rolebinding
+  name: operator-controller-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: operator-controller-proxy-role
+  name: operator-controller-manager-role
 subjects:
   - kind: ServiceAccount
     name: operator-controller-controller-manager