[ceph-rgw] Multiple namespace support for the ceph-rgw-pool job

The ClusterRole and ClusterRoleBinding definitions for the
ceph-rgw-pool job don't take the namespace into account. This isn't
an issue for deployments that include a single Ceph cluster, but
this change adds the namespace to the names of those resources to
allow the job to be deployed correctly in multiple namespaces.

Change-Id: I98a82331a52702c623941f839d1258088813f70e
This commit is contained in:
Stephen Taylor 2023-11-06 10:03:32 -07:00
parent c047fce569
commit 86aa30fc72
3 changed files with 5 additions and 4 deletions

View File

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

View File

@ -27,7 +27,7 @@ limitations under the License.
kind: ClusterRole kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: {{ $serviceAccountName }} name: {{ $serviceAccountName }}-{{ $envAll.Release.Namespace }}
rules: rules:
- apiGroups: - apiGroups:
- '' - ''
@ -52,14 +52,14 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: {{ $serviceAccountName }} name: {{ $serviceAccountName }}-{{ $envAll.Release.Namespace }}
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ $serviceAccountName }} name: {{ $serviceAccountName }}
namespace: {{ $envAll.Release.Namespace }} namespace: {{ $envAll.Release.Namespace }}
roleRef: roleRef:
kind: ClusterRole kind: ClusterRole
name: {{ $serviceAccountName }} name: {{ $serviceAccountName }}-{{ $envAll.Release.Namespace }}
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
--- ---
apiVersion: batch/v1 apiVersion: batch/v1

View File

@ -32,4 +32,5 @@ ceph-rgw:
- 0.1.29 Add 2023.1 Ubuntu Focal overrides - 0.1.29 Add 2023.1 Ubuntu Focal overrides
- 0.1.30 Update Rook to 1.12.5 and Ceph to 18.2.0 - 0.1.30 Update Rook to 1.12.5 and Ceph to 18.2.0
- 0.1.31 Add a ceph-rgw-pool job to manage RGW pools - 0.1.31 Add a ceph-rgw-pool job to manage RGW pools
- 0.1.32 Multiple namespace support for the ceph-rgw-pool job
... ...