From 86aa30fc72d0d472af8224ffef6b9ac6c432a504 Mon Sep 17 00:00:00 2001
From: Stephen Taylor <stephen.taylor.1@att.com>
Date: Mon, 6 Nov 2023 10:03:32 -0700
Subject: [PATCH] [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
---
 ceph-rgw/Chart.yaml                  | 2 +-
 ceph-rgw/templates/job-rgw-pool.yaml | 6 +++---
 releasenotes/notes/ceph-rgw.yaml     | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ceph-rgw/Chart.yaml b/ceph-rgw/Chart.yaml
index f24c29208..d9466c956 100644
--- a/ceph-rgw/Chart.yaml
+++ b/ceph-rgw/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph RadosGW
 name: ceph-rgw
-version: 0.1.31
+version: 0.1.32
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-rgw/templates/job-rgw-pool.yaml b/ceph-rgw/templates/job-rgw-pool.yaml
index c96e4c69f..dfe9c8f00 100644
--- a/ceph-rgw/templates/job-rgw-pool.yaml
+++ b/ceph-rgw/templates/job-rgw-pool.yaml
@@ -27,7 +27,7 @@ limitations under the License.
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ $serviceAccountName }}
+  name: {{ $serviceAccountName }}-{{ $envAll.Release.Namespace }}
 rules:
   - apiGroups:
       - ''
@@ -52,14 +52,14 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ $serviceAccountName }}
+  name: {{ $serviceAccountName }}-{{ $envAll.Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ $serviceAccountName }}
     namespace: {{ $envAll.Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: {{ $serviceAccountName }}
+  name: {{ $serviceAccountName }}-{{ $envAll.Release.Namespace }}
   apiGroup: rbac.authorization.k8s.io
 ---
 apiVersion: batch/v1
diff --git a/releasenotes/notes/ceph-rgw.yaml b/releasenotes/notes/ceph-rgw.yaml
index d12236d25..62a098ebb 100644
--- a/releasenotes/notes/ceph-rgw.yaml
+++ b/releasenotes/notes/ceph-rgw.yaml
@@ -32,4 +32,5 @@ ceph-rgw:
   - 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.31 Add a ceph-rgw-pool job to manage RGW pools
+  - 0.1.32 Multiple namespace support for the ceph-rgw-pool job
 ...