From 15ec005a8b40ba35feafe8cf55cf80baf148ff58 Mon Sep 17 00:00:00 2001 From: Anastas Dancha Date: Wed, 15 May 2019 19:00:43 +0300 Subject: [PATCH] [stable/postgresql] excluding ".snapshot" in chown during init (#13754) * excluding ".snapshot" in chown during init in some environment, where PVs are NFS volumes with `.shapshot` directories, such as the case with NetApps, `chown -R` would fail during execution of initContainer command to avoid failure, `.snapshot` shouldbe excluded from `chown -R` Signed-off-by: Anastas Dancha * same in less lines Signed-off-by: Anastas Dancha * using find statement w/ xargs for error handling Signed-off-by: Anastas Dancha --- stable/postgresql/Chart.yaml | 2 +- stable/postgresql/templates/statefulset-slaves.yaml | 3 ++- stable/postgresql/templates/statefulset.yaml | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/stable/postgresql/Chart.yaml b/stable/postgresql/Chart.yaml index 9503f00e9a..79f88d6088 100644 --- a/stable/postgresql/Chart.yaml +++ b/stable/postgresql/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: postgresql -version: 4.2.0 +version: 4.2.1 appVersion: 10.8.0 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance. keywords: diff --git a/stable/postgresql/templates/statefulset-slaves.yaml b/stable/postgresql/templates/statefulset-slaves.yaml index eacbab8452..ace0144827 100644 --- a/stable/postgresql/templates/statefulset-slaves.yaml +++ b/stable/postgresql/templates/statefulset-slaves.yaml @@ -67,7 +67,8 @@ spec: - sh - -c - | - chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} /bitnami + find {{ .Values.persistence.mountPath }} -mindepth 1 -maxdepth 1 -not -name ".snapshot" | \ + xargs chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} if [ -d {{ .Values.persistence.mountPath }}/data ]; then chmod 0700 {{ .Values.persistence.mountPath }}/data; fi diff --git a/stable/postgresql/templates/statefulset.yaml b/stable/postgresql/templates/statefulset.yaml index ffb2570d71..318181d366 100644 --- a/stable/postgresql/templates/statefulset.yaml +++ b/stable/postgresql/templates/statefulset.yaml @@ -55,7 +55,7 @@ spec: {{- end }} {{- if .Values.securityContext.enabled }} securityContext: - fsGroup: {{ .Values.securityContext.fsGroup }} + fsGroup: {{ .Values.securityContext.fsGroup }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ default (include "postgresql.fullname" . ) .Values.serviceAccount.name }} @@ -71,7 +71,8 @@ spec: - sh - -c - | - chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} /bitnami + find {{ .Values.persistence.mountPath }} -mindepth 1 -maxdepth 1 -not -name ".snapshot" | \ + xargs chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} if [ -d {{ .Values.persistence.mountPath }}/data ]; then chmod 0700 {{ .Values.persistence.mountPath }}/data; fi @@ -220,7 +221,7 @@ spec: {{- if .Values.metrics.securityContext.enabled }} securityContext: runAsUser: {{ .Values.metrics.securityContext.runAsUser }} - {{- end }} + {{- end }} env: {{- $database := required "In order to enable metrics you need to specify a database (.Values.postgresqlDatabase or .Values.global.postgresql.postgresqlDatabase)" (include "postgresql.database" .) }} - name: DATA_SOURCE_URI