From f900462c336a6a586bbc2e0a67a4c0f141c167ca Mon Sep 17 00:00:00 2001
From: "Sigunov, Vladimir (vs422h)" <vs422h@att.com>
Date: Wed, 13 Apr 2022 13:59:57 -0400
Subject: [PATCH] [CEPH] Endpoints discovery

Allows to discover monitor endpoints for multiple RGWs instances
deployed in different namespaces.

Change-Id: Ia4a9a4b011951cec9f88ede41ba0286863fde86e
---
 ceph-rgw/Chart.yaml                    | 2 +-
 ceph-rgw/templates/deployment-rgw.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 757ad2ca6..e42ef8acc 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.20
+version: 0.1.21
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-rgw/templates/deployment-rgw.yaml b/ceph-rgw/templates/deployment-rgw.yaml
index cb62515c0..07da5dbb7 100644
--- a/ceph-rgw/templates/deployment-rgw.yaml
+++ b/ceph-rgw/templates/deployment-rgw.yaml
@@ -41,7 +41,7 @@ limitations under the License.
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ $serviceAccountName }}
+  name: {{ printf "%s-%s" $serviceAccountName $envAll.Release.Namespace }}
   namespace: {{ .Values.endpoints.ceph_mon.namespace }}
 rules:
   - apiGroups:
@@ -56,11 +56,11 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ $serviceAccountName }}
+  name: {{ printf "%s-%s" $serviceAccountName $envAll.Release.Namespace }}
   namespace: {{ .Values.endpoints.ceph_mon.namespace }}
 roleRef:
   kind: Role
-  name: {{ $serviceAccountName }}
+  name: {{ printf "%s-%s" $serviceAccountName $envAll.Release.Namespace }}
   apiGroup: rbac.authorization.k8s.io
 subjects:
   - kind: ServiceAccount
diff --git a/releasenotes/notes/ceph-rgw.yaml b/releasenotes/notes/ceph-rgw.yaml
index 5835f9b59..eb7f72e52 100644
--- a/releasenotes/notes/ceph-rgw.yaml
+++ b/releasenotes/notes/ceph-rgw.yaml
@@ -21,4 +21,5 @@ ceph-rgw:
   - 0.1.18 Consolidate mon_endpoints discovery
   - 0.1.19 Add ClusterRole to the bootstrap-job
   - 0.1.20 Enable taint toleration for Openstack services jobs
+  - 0.1.21 Correct mon discovery for multiple RGWs in different NS
 ...