Revert "fix: used dedicated clusterrole for kcore hooks (#1635)"

This reverts commit 6d2c1f3.
mesosphere · Oct 14, 2023 · eceb624 · eceb624
1 parent d7d7043
commit eceb624
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 51 deletions.
diff --git a/charts/kommander-operator/templates/post_install_kommandercore_hook.yaml b/charts/kommander-operator/templates/post_install_kommandercore_hook.yaml
@@ -10,27 +10,6 @@ metadata:
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ .Chart.Name }}-installation
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "-5"
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-rules:
-  - apiGroups:
-      - dkp.d2iq.io
-    resources:
-      - kommandercores
-    verbs:
-      - get
-      - list
-      - watch
-      - create
-      - patch
-      - update
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ .Chart.Name }}-installation
@@ -41,11 +20,12 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Chart.Name }}-installation
+  name: cluster-admin
 subjects:
   - kind: ServiceAccount
     name: {{ .Chart.Name }}-installation
     namespace: {{ .Release.Namespace }}
+
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/charts/kommander-operator/templates/pre_upgrade_kommandercore_hook.yaml b/charts/kommander-operator/templates/pre_upgrade_kommandercore_hook.yaml
@@ -11,34 +11,6 @@ metadata:
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ .Chart.Name }}-pre-upgrade
-  annotations:
-    "helm.sh/hook": pre-upgrade
-    "helm.sh/hook-weight": "-5"
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-rules:
-  - apiGroups:
-      - dkp.d2iq.io
-      - helm.toolkit.fluxcd.io
-    resources:
-      - kommandercores
-      - helmreleases
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - dkp.d2iq.io
-    resources:
-      - kommandercores
-      - kommandercores/status
-    verbs:
-      - patch
-      - update
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ .Chart.Name }}-pre-upgrade
@@ -49,7 +21,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Chart.Name }}-pre-upgrade
+  name: cluster-admin
 subjects:
   - kind: ServiceAccount
     name: {{ .Chart.Name }}-pre-upgrade