Merge "update release version of modeling-etsicatalog"

[oom.git] / kubernetes / policy / charts / pdp / templates / statefulset.yaml

diff --git a/kubernetes/policy/charts/pdp/templates/statefulset.yaml b/kubernetes/policy/charts/pdp/templates/statefulset.yaml
index a3a8f6a..16d5fb5 100644 (file)
--- a/kubernetes/policy/charts/pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/charts/pdp/templates/statefulset.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   serviceName: {{ include "common.servicename" . }}
@@ -33,7 +33,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
       initContainers:
       - command:
@@ -58,6 +58,11 @@ spec:
         name: {{ include "common.name" . }}
         image: "{{ include "common.repository" . }}/{{ .Values.image }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        env:
+        - name: JDBC_USER
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "login") | indent 10 }}
+        - name: JDBC_PASSWORD
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "password") | indent 10 }}
         resources:
 {{ include "common.resources" . | indent 12 }}
         ports:
@@ -119,7 +124,7 @@ spec:
           path: /etc/localtime
       - name: filebeat-conf
         configMap:
-          name: {{ .Release.Name }}-filebeat-configmap
+          name: {{ include "common.release" . }}-filebeat-configmap
       - name: policy-logs
         emptyDir: {}
       - name: policy-data-filebeat
@@ -129,11 +134,11 @@ spec:
           name: {{ include "common.fullname" . }}-log-configmap
       - name: pe
         configMap:
-          name: {{ .Release.Name }}-pe-configmap
+          name: {{ include "common.release" . }}-pe-configmap
           defaultMode: 0755
       - name: pe-scripts
         configMap:
-          name: {{ .Release.Name }}-pe-scripts-configmap
+          name: {{ include "common.release" . }}-pe-scripts-configmap
           defaultMode: 0777
       - name: pe-pdp
         configMap: