Synchronize upstreamed folder to cec86f65c

upstreamed/postgresql/Chart.yaml

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

upstreamed/postgresql/templates/statefulset-slaves.yaml

@@ -47,6 +47,10 @@ spec:
       {{- if .Values.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
       {{- end }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+      {{- end }}
       {{- if and .Values.volumePermissions.enabled .Values.persistence.enabled }}
       initContainers:
       - name: init-chmod-data
@@ -76,7 +80,6 @@ spec:
 {{ toYaml .Values.resources | indent 10 }}
         {{- if .Values.securityContext.enabled }}
         securityContext:
-          fsGroup: {{ .Values.securityContext.fsGroup }}
           runAsUser: {{ .Values.securityContext.runAsUser }}
         {{- end }}
         env:

upstreamed/postgresql/templates/statefulset.yaml

@@ -51,6 +51,10 @@ spec:
       {{- if .Values.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
       {{- end }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+      {{- end }}
       {{- if and .Values.volumePermissions.enabled .Values.persistence.enabled }}
       initContainers:
       - name: init-chmod-data
@@ -80,7 +84,6 @@ spec:
 {{ toYaml .Values.resources | indent 10 }}
         {{- if .Values.securityContext.enabled }}
         securityContext:
-          fsGroup: {{ .Values.securityContext.fsGroup }}
           runAsUser: {{ .Values.securityContext.runAsUser }}
         {{- end }}
         env:

upstreamed/redis/Chart.yaml

@@ -1,5 +1,5 @@
 name: redis
-version: 6.0.1
+version: 6.1.0
 appVersion: 4.0.12
 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets.
 keywords:

upstreamed/redis/templates/_helpers.tpl

@@ -102,7 +102,7 @@ readinessProbe:
     command:
     - sh
     - -c
-    - /health/ping_local_and_master.sh
+    - /health/ping_local_and_master.sh {{ $readinessProbe.timeoutSeconds | default .Values.master.readinessProbe.timeoutSeconds }}
 {{- end }}
 {{- end -}}
 {{- end -}}
@@ -124,7 +124,7 @@ livenessProbe:
     command:
     - sh
     - -c
-    - /health/ping_local_and_master.sh
+    - /health/ping_local_and_master.sh {{ $livenessProbe.timeoutSeconds | default .Values.master.livenessProbe.timeoutSeconds }}
 {{- end }}
 {{- end -}}
 {{- end -}}

upstreamed/redis/templates/health-configmap.yaml

@@ -14,6 +14,7 @@ data:
     export REDIS_PASSWORD=$password_aux
 {{- end }}
     response=$(
+      timeout -s 9 $1 \
       redis-cli \
 {{- if .Values.usePassword }}
         -a $REDIS_PASSWORD \
@@ -32,6 +33,7 @@ data:
     export REDIS_MASTER_PASSWORD=$password_aux
 {{- end }}
     response=$(
+      timeout -s 9 $1 \
       redis-cli \
 {{- if .Values.usePassword }}
         -a $REDIS_MASTER_PASSWORD \
@@ -47,6 +49,6 @@ data:
   ping_local_and_master.sh: |-
     script_dir="$(dirname "$0")"
     exit_status=0
-    "$script_dir/ping_local.sh" || exit_status=$?
-    "$script_dir/ping_master.sh" || exit_status=$?
+    "$script_dir/ping_local.sh" $1 || exit_status=$?
+    "$script_dir/ping_master.sh" $1 || exit_status=$?
     exit $exit_status

upstreamed/redis/templates/redis-master-statefulset.yaml

@@ -121,7 +121,7 @@ spec:
             command:
             - sh
             - -c
-            - /health/ping_local.sh
+            - /health/ping_local.sh {{ .Values.master.livenessProbe.timeoutSeconds }}
         {{- end }}
         {{- if .Values.master.readinessProbe.enabled}}
         readinessProbe:
@@ -134,7 +134,7 @@ spec:
             command:
             - sh
             - -c
-            - /health/ping_local.sh
+            - /health/ping_local.sh {{ .Values.master.livenessProbe.timeoutSeconds }}
         {{- end }}
         resources:
 {{ toYaml .Values.master.resources | indent 10 }}