[stable/postgresql] improving consistency between master and slave sts (#9272)

* Added debugging flags to master node

Signed-off-by: Joao C Costa <joaocc-dev@live.com>

* Annotation style consistent with master

Signed-off-by: Joao C Costa <joaocc-dev@live.com>

* Added terminationGracePeriod spec to slave nodes

Signed-off-by: Joao C Costa <joaocc-dev@live.com>

* Bump chart version

Signed-off-by: Joao C Costa <joaocc-dev@live.com>

* fixing env vars value - helm requires them to be strings

Signed-off-by: Joao C Costa <joaocc-dev@live.com>

* [stable/postgresql] bump chart version

Signed-off-by: Joao C Costa <joaocc-dev@live.com>

stable/postgresql/Chart.yaml

@@ -1,5 +1,5 @@
 name: postgresql
-version: 2.6.1
+version: 2.6.2
 appVersion: 10.6.0
 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance.
 keywords:

stable/postgresql/templates/statefulset-slaves.yaml

@@ -50,6 +50,9 @@ spec:
       {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
       {{- end }}
       {{- if and .Values.persistence.enabled .Values.securityContext.enabled}}
       initContainers:
@@ -79,9 +82,9 @@ spec:
         env:
         {{- if .Values.image.debug}}
         - name: BASH_DEBUG
-          value: 1
+          value: "1"
         - name: NAMI_DEBUG
-          value: 1
+          value: "1"
         {{- end }}
         - name: POSTGRESQL_REPLICATION_MODE
           value: "slave"
@@ -152,10 +155,12 @@ spec:
   volumeClaimTemplates:
     - metadata:
         name: data
+      {{- with .Values.persistence.annotations }}
         annotations:
-        {{- range $key, $value := .Values.persistence.annotations }}
+        {{- range $key, $value := . }}
           {{ $key }}: {{ $value }}
         {{- end }}
+      {{- end }}
       spec:
         accessModes:
         {{- range .Values.persistence.accessModes }}

stable/postgresql/templates/statefulset.yaml

@@ -79,6 +79,12 @@ spec:
         resources:
 {{ toYaml .Values.resources | indent 10 }}
         env:
+        {{- if .Values.image.debug}}
+        - name: BASH_DEBUG
+          value: "1"
+        - name: NAMI_DEBUG
+          value: "1"
+        {{- end }}
         {{- if .Values.replication.enabled }}
         - name: POSTGRESQL_REPLICATION_MODE
           value: "master"