[ceph-client] More robust naming of clusterrole-checkdns

Currently if multiple instances of the ceph-client chart are
deployed in the same Kubernetes cluster, the releases will
conflict because the clusterrole-checkdns ClusterRole is a global
resources and has a hard-coded name. This change scopes the
ClusterRole name by release name to address this.

Change-Id: I17d04720ca301f643f6fb9cf5a9b2eec965ef537
This commit is contained in:
Stephen Taylor 2022-03-10 07:21:54 -07:00
parent 77a94d4630
commit 3b9aa44ac5
3 changed files with 4 additions and 3 deletions

View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ceph Client description: OpenStack-Helm Ceph Client
name: ceph-client name: ceph-client
version: 0.1.32 version: 0.1.33
home: https://github.com/ceph/ceph-client home: https://github.com/ceph/ceph-client
... ...

View File

@ -28,7 +28,7 @@ and its reference can not be changed.
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: clusterrole-checkdns name: {{ printf "%s-%s" $envAll.Release.Name "clusterrole-checkdns" | quote }}
rules: rules:
- apiGroups: - apiGroups:
- "" - ""
@ -52,7 +52,7 @@ metadata:
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
name: clusterrole-checkdns name: {{ printf "%s-%s" $envAll.Release.Name "clusterrole-checkdns" | quote }}
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ $serviceAccountName }} name: {{ $serviceAccountName }}

View File

@ -33,4 +33,5 @@ ceph-client:
- 0.1.30 Move ceph-mgr deployment to the ceph-mon chart - 0.1.30 Move ceph-mgr deployment to the ceph-mon chart
- 0.1.31 Consolidate mon_endpoints discovery - 0.1.31 Consolidate mon_endpoints discovery
- 0.1.32 Simplify test rules for ceph-mgr deployment - 0.1.32 Simplify test rules for ceph-mgr deployment
- 0.1.33 More robust naming of clusterrole-checkdns
... ...