Merge pull request #8961 from rook/mergify/bp/release-1.7/pr-8884

helm: remove chart content not in common.yaml  (backport #8884)

.commitlintrc.json

@@ -15,6 +15,7 @@
         "core",
         "csi",
         "docs",
+        "helm",
         "mds",
         "mgr",
         "mon",

cluster/charts/rook-ceph/templates/clusterrole.yaml

@@ -264,24 +264,6 @@ rules:
   verbs:
   - get
   - list
-# Use a default dict to avoid 'can't give argument to non-function' errors from text/template
-{{- if ne ((.Values.agent | default (dict "mountSecurityMode" "")).mountSecurityMode | default "") "Any" }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: rook-ceph-agent-mount
-  labels:
-    operator: rook
-    storage-backend: ceph
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-{{- end }}
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1

cluster/charts/rook-ceph/templates/clusterrolebinding.yaml

@@ -152,23 +152,6 @@ subjects:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
-metadata:
-  name: rook-ceph-system-psp-users
-  labels:
-    operator: rook
-    storage-backend: ceph
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: rook-ceph-system-psp-user
-subjects:
-- kind: ServiceAccount
-  name: rook-ceph-system
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
 metadata:
   name: rook-csi-cephfs-provisioner-sa-psp
 roleRef: