Merge pull request #769 from truenas/NAS-118354

NAS-118354 / 22.12 / Fix root user not exist error in nextcloud postgres logs

charts/nextcloud/1.6.10/Chart.yaml → charts/nextcloud/1.6.11/Chart.yaml

@@ -19,4 +19,4 @@ sources:
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
 upstream_version: 2.3.2
-version: 1.6.10
+version: 1.6.11

charts/nextcloud/1.6.10/templates/deployment.yaml → charts/nextcloud/1.6.11/templates/deployment.yaml

@@ -8,8 +8,10 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
       initContainers:
         - name: init-postgresdb
           image: {{ template "postgres.imageName" . }}
-          command: ['sh', '-c', "until pg_isready -h {{ template "common.names.fullname" $postgres_values }}; do echo waiting for postgres; sleep 2; done"]
+          command: ['sh', '-c', "until pg_isready -U $POSTGRES_USER -d {{ include "postgres.DatabaseName" .Values }} -h {{ template "common.names.fullname" $postgres_values }}; do echo waiting for postgres; sleep 2; done"]
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env: {{ include "postgres.envVariableConfiguration" $postgres_values | nindent 10 }}
+
       containers:
       {{ if eq (include "nginx.certAvailable" .) "true" }}
       - name: nginx

test/nextcloud/1.6.10/Chart.yaml → test/nextcloud/1.6.11/Chart.yaml

@@ -19,4 +19,4 @@ sources:
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
 upstream_version: 2.3.2
-version: 1.6.10
+version: 1.6.11

test/nextcloud/1.6.10/templates/deployment.yaml → test/nextcloud/1.6.11/templates/deployment.yaml

@@ -8,8 +8,10 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
       initContainers:
         - name: init-postgresdb
           image: {{ template "postgres.imageName" . }}
-          command: ['sh', '-c', "until pg_isready -h {{ template "common.names.fullname" $postgres_values }}; do echo waiting for postgres; sleep 2; done"]
+          command: ['sh', '-c', "until pg_isready -U $POSTGRES_USER -d {{ include "postgres.DatabaseName" .Values }} -h {{ template "common.names.fullname" $postgres_values }}; do echo waiting for postgres; sleep 2; done"]
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env: {{ include "postgres.envVariableConfiguration" $postgres_values | nindent 10 }}
+
       containers:
       {{ if eq (include "nginx.certAvailable" .) "true" }}
       - name: nginx