X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=it%2Fdep.git;a=blobdiff_plain;f=smo-install%2Foran_oom%2Fhelmmanager%2Ftemplates%2Fserviceaccount.yaml;fp=smo-install%2Foran_oom%2Fhelmmanager%2Ftemplates%2Fserviceaccount.yaml;h=a2f4242c93072cc023c33ff00c01c0111985ebb3;hp=60c081dcbfc97d23caca7fd58a9db66e4e378cfe;hb=918108f729c368db61fe904024129f21269e19b7;hpb=c9ace66e2b4635918c4c4c473dfc7bcbeb41b7ae

diff --git a/smo-install/oran_oom/helmmanager/templates/serviceaccount.yaml b/smo-install/oran_oom/helmmanager/templates/serviceaccount.yaml
index 60c081dc..a2f4242c 100644
--- a/smo-install/oran_oom/helmmanager/templates/serviceaccount.yaml
+++ b/smo-install/oran_oom/helmmanager/templates/serviceaccount.yaml
@@ -18,26 +18,21 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "common.namespace.nonrtric" . }}-helm-manager-sa
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.helmmanager" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-
+  name: {{ include "common.namespace" . }}-helm-manager-sa
+  namespace: {{ include "common.namespace" . }}
+  labels: {{- include "common.labels" . | nindent 4 }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
- name: {{ include "common.namespace.nonrtric" . }}-helm-manager-sa-clusterrolebinding
- namespace: {{ include "common.namespace.nonrtric" . }}
+ name: {{ include "common.namespace" . }}-helm-manager-sa-clusterrolebinding
+ namespace: {{ include "common.namespace" . }}
+ labels: {{- include "common.labels" . | nindent 4 }}
 subjects:
 - kind: ServiceAccount
-  name: {{ include "common.namespace.nonrtric" . }}-helm-manager-sa
-  namespace: {{ include "common.namespace.nonrtric" . }}
+  name: {{ include "common.namespace" . }}-helm-manager-sa
+  namespace: {{ include "common.namespace" . }}
 roleRef:
  kind: ClusterRole
- name: {{ .Values.helmmanager.clusterRoleName }}
+ name: {{ .Values.clusterRoleName }}
  apiGroup: rbac.authorization.k8s.io