Skip to content

Commit

Permalink
helm: remove chart content not in common.yaml
Browse files Browse the repository at this point in the history
Assume common.yaml is the right source of truth, and remove major
content from helm charts that does not exist in common.yaml.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
  • Loading branch information
BlaineEXE committed Sep 30, 2021
1 parent 6603fd1 commit e770238
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 67 deletions.
1 change: 1 addition & 0 deletions .commitlintrc.json
Expand Up @@ -15,6 +15,7 @@
"core",
"csi",
"docs",
"helm",
"mds",
"mgr",
"mon",
Expand Down
32 changes: 0 additions & 32 deletions build/rbac/rbac.yaml
Expand Up @@ -177,21 +177,6 @@ rules:
resources: [serviceaccounts]
verbs: [get]
---
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
---
# The cluster role for managing all the cluster-specific resources in a namespace
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
Expand Down Expand Up @@ -470,7 +455,6 @@ rules:
verbs:
- get
- list
# Use a default dict to avoid 'can't give argument to non-function' errors from text/template
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
Expand Down Expand Up @@ -636,22 +620,6 @@ subjects:
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: rook-ceph-system-psp-users
labels:
operator: rook
storage-backend: ceph
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: rook-ceph-system-psp-user
subjects:
- kind: ServiceAccount
name: rook-ceph-system
namespace: rook-ceph
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: rook-csi-cephfs-plugin-sa-psp
roleRef:
Expand Down
18 changes: 0 additions & 18 deletions cluster/charts/rook-ceph/templates/clusterrole.yaml
Expand Up @@ -296,24 +296,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
Expand Down
17 changes: 0 additions & 17 deletions cluster/charts/rook-ceph/templates/clusterrolebinding.yaml
Expand Up @@ -153,23 +153,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:
Expand Down

0 comments on commit e770238

Please sign in to comment.