Improve oran_oom helm charts

[it/dep.git] / smo-install / oran_oom / helmmanager / templates / serviceaccount.yaml

diff --git a/smo-install/oran_oom/helmmanager/templates/serviceaccount.yaml b/smo-install/oran_oom/helmmanager/templates/serviceaccount.yaml
index 60c081d..a2f4242 100644 (file)
--- 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