[MOSIP-34323] updated name of existing cluster role and binding for u…

…niqueness Signed-off-by: ckm007 <[email protected]>
mosip · Jul 9, 2024 · d78ece6 · d78ece6
1 parent 7ee42c6
commit d78ece6
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 22 deletions.
diff --git a/...lorchestrator/templates/cluster-role.yaml → charts/apitestrig/templates/clusterrole.yaml b/...lorchestrator/templates/cluster-role.yaml → charts/apitestrig/templates/clusterrole.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "dslorchestrator.serviceAccountName" . }}-pods-role
+  name: {{ template "apitestrig.serviceAccountName" . }}-{{ .Release.Namespace }}
   namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups: [""]

diff --git a/charts/apitestrig/templates/clusterrolebinding.yaml b/charts/apitestrig/templates/clusterrolebinding.yaml
@@ -5,15 +5,15 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "apitestrig.serviceAccountName" . }}-pods-role
+  name: {{ template "apitestrig.serviceAccountName" . }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "apitestrig.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ .Release.Namespace }}
diff --git a/charts/uitestrig/templates/cluster-role.yaml → ...slorchestrator/templates/clusterrole.yaml b/charts/uitestrig/templates/cluster-role.yaml → ...slorchestrator/templates/clusterrole.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "uitestrig.serviceAccountName" . }}-pods-role
+  name: {{ template "dslorchestrator.serviceAccountName" . }}-{{ .Release.Namespace }}
   namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups: [""]

diff --git a/charts/dslorchestrator/templates/clusterrolebinding.yaml b/charts/dslorchestrator/templates/clusterrolebinding.yaml
@@ -5,14 +5,14 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "dslorchestrator.serviceAccountName" . }}-pods-role
+  name: {{ template "dslorchestrator.serviceAccountName" . }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "dslorchestrator.serviceAccountName" . }}

diff --git a/charts/packetmanager/templates/clusterrole.yaml b/charts/packetmanager/templates/clusterrole.yaml
@@ -1,7 +1,7 @@
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRole
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "common.names.fullname" . }}-{{ .Release.Namespace }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}

diff --git a/charts/packetmanager/templates/clusterrolebinding.yaml b/charts/packetmanager/templates/clusterrolebinding.yaml
@@ -5,14 +5,14 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "packetmanager.serviceAccountName" . }}

diff --git a/charts/restart-cron/templates/clusterrole.yaml b/charts/restart-cron/templates/clusterrole.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     meta.helm.sh/release-name: restart-cron
     meta.helm.sh/release-namespace: infra-admin
-  name: pod-deleter-role
+  name: {{ .Values.role.name }}-{{ .Release.Namespace }}
 rules:
   - apiGroups:
       - apps

diff --git a/...s/restart-cron/templates/rolebinding.yaml → ...rt-cron/templates/clusterrolebinding.yaml b/...s/restart-cron/templates/rolebinding.yaml → ...rt-cron/templates/clusterrolebinding.yaml
@@ -1,12 +1,12 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ .Values.rbac.name }}
+  name: {{ .Values.rbac.name }}-{{ .Release.Namespace }}
   namespace: {{ .Values.rbac.namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Values.role.name }}
+  name: {{ .Values.role.name }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Values.serviceAccount.name }}

diff --git a/...ts/apitestrig/templates/cluster-role.yaml → charts/uitestrig/templates/clusterrole.yaml b/...ts/apitestrig/templates/cluster-role.yaml → charts/uitestrig/templates/clusterrole.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "apitestrig.serviceAccountName" . }}-pods-role
+  name: {{ template "uitestrig.serviceAccountName" . }}-{{ .Release.Namespace }}
   namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups: [""]

diff --git a/charts/uitestrig/templates/clusterrolebinding.yaml b/charts/uitestrig/templates/clusterrolebinding.yaml
@@ -5,14 +5,14 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "uitestrig.serviceAccountName" . }}-pods-role
+  name: {{ template "uitestrig.serviceAccountName" . }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "uitestrig.serviceAccountName" . }}

diff --git a/charts/websub-consolidator/templates/clusterrole.yaml b/charts/websub-consolidator/templates/clusterrole.yaml
@@ -1,7 +1,7 @@
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRole
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "common.names.fullname" . }}-{{ .Release.Namespace }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}

diff --git a/charts/websub-consolidator/templates/clusterrolebinding.yaml b/charts/websub-consolidator/templates/clusterrolebinding.yaml
@@ -5,14 +5,14 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "websub-consolidator.serviceAccountName" . }}

diff --git a/charts/websub/templates/clusterrole.yaml b/charts/websub/templates/clusterrole.yaml
@@ -1,7 +1,7 @@
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRole
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "common.names.fullname" . }}-{{ .Release.Namespace }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}

diff --git a/charts/websub/templates/clusterrolebinding.yaml b/charts/websub/templates/clusterrolebinding.yaml
@@ -5,14 +5,14 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "websub.serviceAccountName" . }}