X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fpostgres%2Ftemplates%2F_deployment.tpl;h=a4eb1107a5264f938e90317dc258b08acc7befd6;hb=47d3ff5e088fdcbde7811bb914aacd26652588a4;hp=6142baa63f3080f73c36864886fb2a0b1769d369;hpb=975d0e282099e87c4902f77185e820faae3e8b4a;p=oom.git

diff --git a/kubernetes/common/postgres/templates/_deployment.tpl b/kubernetes/common/postgres/templates/_deployment.tpl
index 6142baa63f..a4eb1107a5 100644
--- a/kubernetes/common/postgres/templates/_deployment.tpl
+++ b/kubernetes/common/postgres/templates/_deployment.tpl
@@ -1,6 +1,8 @@
 {{/*
 # Copyright © 2018 Amdocs, AT&T, Bell Canada
 # Copyright © 2020 Samsung Electronics
+# Copyright © 2021 Orange
+# Modifications Copyright (C) 2021 Bell Canada.
 # #
 # # Licensed under the Apache License, Version 2.0 (the "License");
 # # you may not use this file except in compliance with the License.
@@ -31,6 +33,8 @@ metadata:
     name: "{{ index $dot.Values "container" "name" $pgMode }}"
 spec:
   replicas: 1
+  strategy:
+    type: Recreate
   selector:
     matchLabels:
       app: {{ include "common.name" $dot }}-{{ $pgMode }}
@@ -41,6 +45,8 @@ spec:
         release: {{ include "common.release" $dot }}
         name: "{{ index $dot.Values "container" "name" $pgMode }}"
     spec:
+      imagePullSecrets:
+      - name: "{{ include "common.namespace" $dot }}-docker-registry-key"
       initContainers:
       - command:
         - sh
@@ -57,6 +63,8 @@ spec:
         env:
         - name: PG_PRIMARY_USER
           value: primaryuser
+        - name: MODE
+          value: postgres
         - name: PG_PRIMARY_PASSWORD_INPUT
           {{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" (include "common.postgres.secret.primaryPasswordUID" .) "key" "password") | indent 10 }}
         - name: PG_USER
@@ -116,12 +124,14 @@ spec:
           value: /tmp
         - name: PG_PRIMARY_USER
           value: primaryuser
+        - name: MODE
+          value: postgres
         - name: PG_MODE
           value: {{ $pgMode }}
         - name: PG_PRIMARY_HOST
-          value: "{{ $dot.Values.container.name.primary }}"
+          value: "{{ $dot.Values.service.name2 }}"
         - name: PG_REPLICA_HOST
-          value: "{{ $dot.Values.container.name.replica }}"
+          value: "{{ $dot.Values.service.name3 }}"
         - name: PG_PRIMARY_PORT
           value: "{{ $dot.Values.service.internalPort }}"
         - name: PG_PRIMARY_PASSWORD
@@ -134,6 +144,8 @@ spec:
           value: "{{ $dot.Values.config.pgDatabase }}"
         - name: PG_ROOT_PASSWORD
           {{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" (include "common.postgres.secret.rootPassUID" .) "key" "password") | indent 10 }}
+        - name: PGDATA_PATH_OVERRIDE
+          value: "{{ $dot.Values.config.pgDataPath }}"
         volumeMounts:
         - name: config
           mountPath: /pgconf/pool_hba.conf
@@ -146,7 +158,50 @@ spec:
         - mountPath: /backup
           name: {{ include "common.fullname" $dot }}-backup
           readOnly: true
-        resources: {{ include "common.resources" $dot | nindent 12 }}
+        resources: {{ include "common.resources" $dot | nindent 10 }}
+      {{- if (default false $dot.Values.metrics.enabled) }}
+      - name: {{ include "common.name" $dot }}-metrics
+        image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ $dot.Values.metrics.image }}
+        imagePullPolicy: {{ $dot.Values.global.pullPolicy | default $dot.Values.metrics.pullPolicy | quote}}
+        env:
+          - name: POSTGRES_METRICS_EXTRA_FLAGS
+            value: {{ default "" (join " " $dot.Values.metrics.extraFlags) | quote }}
+          - name: DATA_SOURCE_USER
+            value: "{{ $dot.Values.metrics.postgresUser }}"
+          - name: DATA_SOURCE_PASS
+            {{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" (include "common.postgres.secret.rootPassUID" .) "key" "password") | indent 12 }}
+        command:
+          - sh
+          - -c
+          - |
+            DATA_SOURCE_URI="127.0.0.1:5432/?sslmode=disable" ./bin/postgres_exporter $POSTGRES_METRICS_EXTRA_FLAGS
+        ports:
+          {{- range $index, $metricPort := $dot.Values.metrics.ports }}
+          - name: {{ $metricPort.name }}
+            containerPort: {{ $metricPort.port }}
+            protocol: TCP
+        {{- end }}
+        livenessProbe:
+          httpGet:
+            path: /metrics
+            port: tcp-metrics
+          initialDelaySeconds: {{ $dot.Values.metrics.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ $dot.Values.metrics.livenessProbe.periodSeconds }}
+          timeoutSeconds: {{ $dot.Values.metrics.livenessProbe.timeoutSeconds }}
+          successThreshold: {{ $dot.Values.metrics.livenessProbe.successThreshold }}
+          failureThreshold: {{ $dot.Values.metrics.livenessProbe.failureThreshold }}
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: tcp-metrics
+          initialDelaySeconds: {{ $dot.Values.metrics.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ $dot.Values.metrics.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ $dot.Values.metrics.readinessProbe.timeoutSeconds }}
+          successThreshold: {{ $dot.Values.metrics.readinessProbe.successThreshold }}
+          failureThreshold: {{ $dot.Values.metrics.readinessProbe.failureThreshold }}
+        {{ include "common.containerSecurityContext" $dot | indent 10 | trim }}
+        resources: {{- toYaml $dot.Values.metrics.resources | nindent 12 }}
+        {{ end }}
         {{- if $dot.Values.nodeSelector }}
         nodeSelector:
 {{ toYaml $dot.Values.nodeSelector | indent 10 }}