J release changes

[ric-plt/ric-dep.git] / helm / infrastructure / subcharts / kong / charts / postgresql / templates / serviceaccount.yaml

diff --git a/helm/infrastructure/subcharts/kong/charts/postgresql/templates/serviceaccount.yaml b/helm/infrastructure/subcharts/kong/charts/postgresql/templates/serviceaccount.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 27e5b51..179f8f2
--- a/helm/infrastructure/subcharts/kong/charts/postgresql/templates/serviceaccount.yaml
+++ b/helm/infrastructure/subcharts/kong/charts/postgresql/templates/serviceaccount.yaml
@@ -1,11 +1,19 @@
-{{- if and (.Values.serviceAccount.enabled) (not .Values.serviceAccount.name) }}
+{{- if .Values.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  labels:
-    app: {{ template "postgresql.name" . }}
-    chart: {{ template "postgresql.chart" . }}
-    release: {{ .Release.Name | quote }}
-    heritage: {{ .Release.Service | quote }}
-  name: {{ template "postgresql.fullname" . }}
-{{- end }}
\ No newline at end of file
+  name: {{ include "postgresql.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
+    {{- if .Values.serviceAccount.annotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.serviceAccount.annotations "context" $ ) | nindent 4 }}
+    {{- end }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
+{{- end }}