diff --git a/charts/nextcloud/1.6.10/.helmignore b/charts/nextcloud/1.6.11/.helmignore similarity index 100% rename from charts/nextcloud/1.6.10/.helmignore rename to charts/nextcloud/1.6.11/.helmignore diff --git a/charts/nextcloud/1.6.10/Chart.lock b/charts/nextcloud/1.6.11/Chart.lock similarity index 100% rename from charts/nextcloud/1.6.10/Chart.lock rename to charts/nextcloud/1.6.11/Chart.lock diff --git a/charts/nextcloud/1.6.10/Chart.yaml b/charts/nextcloud/1.6.11/Chart.yaml similarity index 97% rename from charts/nextcloud/1.6.10/Chart.yaml rename to charts/nextcloud/1.6.11/Chart.yaml index 8d32384dcc..6834407a38 100644 --- a/charts/nextcloud/1.6.10/Chart.yaml +++ b/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 diff --git a/charts/nextcloud/1.6.10/README.md b/charts/nextcloud/1.6.11/README.md similarity index 100% rename from charts/nextcloud/1.6.10/README.md rename to charts/nextcloud/1.6.11/README.md diff --git a/charts/nextcloud/1.6.10/app-readme.md b/charts/nextcloud/1.6.11/app-readme.md similarity index 100% rename from charts/nextcloud/1.6.10/app-readme.md rename to charts/nextcloud/1.6.11/app-readme.md diff --git a/charts/nextcloud/1.6.10/charts/common-2207.0.0.tgz b/charts/nextcloud/1.6.11/charts/common-2207.0.0.tgz similarity index 100% rename from charts/nextcloud/1.6.10/charts/common-2207.0.0.tgz rename to charts/nextcloud/1.6.11/charts/common-2207.0.0.tgz diff --git a/charts/nextcloud/1.6.10/ix_values.yaml b/charts/nextcloud/1.6.11/ix_values.yaml similarity index 100% rename from charts/nextcloud/1.6.10/ix_values.yaml rename to charts/nextcloud/1.6.11/ix_values.yaml diff --git a/charts/nextcloud/1.6.10/migrations/migrate_from_1.1.0 b/charts/nextcloud/1.6.11/migrations/migrate_from_1.1.0 similarity index 100% rename from charts/nextcloud/1.6.10/migrations/migrate_from_1.1.0 rename to charts/nextcloud/1.6.11/migrations/migrate_from_1.1.0 diff --git a/charts/nextcloud/1.6.10/questions.yaml b/charts/nextcloud/1.6.11/questions.yaml similarity index 100% rename from charts/nextcloud/1.6.10/questions.yaml rename to charts/nextcloud/1.6.11/questions.yaml diff --git a/charts/nextcloud/1.6.10/requirements.lock b/charts/nextcloud/1.6.11/requirements.lock similarity index 100% rename from charts/nextcloud/1.6.10/requirements.lock rename to charts/nextcloud/1.6.11/requirements.lock diff --git a/charts/nextcloud/1.6.10/templates/NOTES.txt b/charts/nextcloud/1.6.11/templates/NOTES.txt similarity index 100% rename from charts/nextcloud/1.6.10/templates/NOTES.txt rename to charts/nextcloud/1.6.11/templates/NOTES.txt diff --git a/charts/nextcloud/1.6.10/templates/_nginx.tpl b/charts/nextcloud/1.6.11/templates/_nginx.tpl similarity index 100% rename from charts/nextcloud/1.6.10/templates/_nginx.tpl rename to charts/nextcloud/1.6.11/templates/_nginx.tpl diff --git a/charts/nextcloud/1.6.10/templates/_postgres.tpl b/charts/nextcloud/1.6.11/templates/_postgres.tpl similarity index 100% rename from charts/nextcloud/1.6.10/templates/_postgres.tpl rename to charts/nextcloud/1.6.11/templates/_postgres.tpl diff --git a/charts/nextcloud/1.6.10/templates/backup-postgres-config.yaml b/charts/nextcloud/1.6.11/templates/backup-postgres-config.yaml similarity index 100% rename from charts/nextcloud/1.6.10/templates/backup-postgres-config.yaml rename to charts/nextcloud/1.6.11/templates/backup-postgres-config.yaml diff --git a/charts/nextcloud/1.6.10/templates/backup-postgres-hook.yaml b/charts/nextcloud/1.6.11/templates/backup-postgres-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.10/templates/backup-postgres-hook.yaml rename to charts/nextcloud/1.6.11/templates/backup-postgres-hook.yaml diff --git a/charts/nextcloud/1.6.10/templates/cronjob.yaml b/charts/nextcloud/1.6.11/templates/cronjob.yaml similarity index 100% rename from charts/nextcloud/1.6.10/templates/cronjob.yaml rename to charts/nextcloud/1.6.11/templates/cronjob.yaml diff --git a/charts/nextcloud/1.6.10/templates/deployment.yaml b/charts/nextcloud/1.6.11/templates/deployment.yaml similarity index 93% rename from charts/nextcloud/1.6.10/templates/deployment.yaml rename to charts/nextcloud/1.6.11/templates/deployment.yaml index 23bf74025d..593e8db419 100644 --- a/charts/nextcloud/1.6.10/templates/deployment.yaml +++ b/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 diff --git a/charts/nextcloud/1.6.10/templates/nginx-configmap.yaml b/charts/nextcloud/1.6.11/templates/nginx-configmap.yaml similarity index 100% rename from charts/nextcloud/1.6.10/templates/nginx-configmap.yaml rename to charts/nextcloud/1.6.11/templates/nginx-configmap.yaml diff --git a/charts/nextcloud/1.6.10/templates/nginx-secret.yaml b/charts/nextcloud/1.6.11/templates/nginx-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.10/templates/nginx-secret.yaml rename to charts/nextcloud/1.6.11/templates/nginx-secret.yaml diff --git a/charts/nextcloud/1.6.10/templates/nuke-deployments-hook.yaml b/charts/nextcloud/1.6.11/templates/nuke-deployments-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.10/templates/nuke-deployments-hook.yaml rename to charts/nextcloud/1.6.11/templates/nuke-deployments-hook.yaml diff --git a/charts/nextcloud/1.6.10/templates/postgres-deployment.yaml b/charts/nextcloud/1.6.11/templates/postgres-deployment.yaml similarity index 100% rename from charts/nextcloud/1.6.10/templates/postgres-deployment.yaml rename to charts/nextcloud/1.6.11/templates/postgres-deployment.yaml diff --git a/charts/nextcloud/1.6.10/templates/postgres-secret.yaml b/charts/nextcloud/1.6.11/templates/postgres-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.10/templates/postgres-secret.yaml rename to charts/nextcloud/1.6.11/templates/postgres-secret.yaml diff --git a/charts/nextcloud/1.6.10/templates/postgres-service.yaml b/charts/nextcloud/1.6.11/templates/postgres-service.yaml similarity index 100% rename from charts/nextcloud/1.6.10/templates/postgres-service.yaml rename to charts/nextcloud/1.6.11/templates/postgres-service.yaml diff --git a/charts/nextcloud/1.6.10/templates/secrets.yaml b/charts/nextcloud/1.6.11/templates/secrets.yaml similarity index 100% rename from charts/nextcloud/1.6.10/templates/secrets.yaml rename to charts/nextcloud/1.6.11/templates/secrets.yaml diff --git a/charts/nextcloud/1.6.10/templates/service.yaml b/charts/nextcloud/1.6.11/templates/service.yaml similarity index 100% rename from charts/nextcloud/1.6.10/templates/service.yaml rename to charts/nextcloud/1.6.11/templates/service.yaml diff --git a/charts/nextcloud/1.6.10/templates/serviceaccount.yaml b/charts/nextcloud/1.6.11/templates/serviceaccount.yaml similarity index 100% rename from charts/nextcloud/1.6.10/templates/serviceaccount.yaml rename to charts/nextcloud/1.6.11/templates/serviceaccount.yaml diff --git a/charts/nextcloud/1.6.10/templates/tests/deployment-check.yaml b/charts/nextcloud/1.6.11/templates/tests/deployment-check.yaml similarity index 100% rename from charts/nextcloud/1.6.10/templates/tests/deployment-check.yaml rename to charts/nextcloud/1.6.11/templates/tests/deployment-check.yaml diff --git a/charts/nextcloud/1.6.10/test_values.yaml b/charts/nextcloud/1.6.11/test_values.yaml similarity index 100% rename from charts/nextcloud/1.6.10/test_values.yaml rename to charts/nextcloud/1.6.11/test_values.yaml diff --git a/test/nextcloud/1.6.10/.helmignore b/test/nextcloud/1.6.11/.helmignore similarity index 100% rename from test/nextcloud/1.6.10/.helmignore rename to test/nextcloud/1.6.11/.helmignore diff --git a/test/nextcloud/1.6.10/Chart.lock b/test/nextcloud/1.6.11/Chart.lock similarity index 100% rename from test/nextcloud/1.6.10/Chart.lock rename to test/nextcloud/1.6.11/Chart.lock diff --git a/test/nextcloud/1.6.10/Chart.yaml b/test/nextcloud/1.6.11/Chart.yaml similarity index 97% rename from test/nextcloud/1.6.10/Chart.yaml rename to test/nextcloud/1.6.11/Chart.yaml index 8d32384dcc..6834407a38 100644 --- a/test/nextcloud/1.6.10/Chart.yaml +++ b/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 diff --git a/test/nextcloud/1.6.10/README.md b/test/nextcloud/1.6.11/README.md similarity index 100% rename from test/nextcloud/1.6.10/README.md rename to test/nextcloud/1.6.11/README.md diff --git a/test/nextcloud/1.6.10/app-readme.md b/test/nextcloud/1.6.11/app-readme.md similarity index 100% rename from test/nextcloud/1.6.10/app-readme.md rename to test/nextcloud/1.6.11/app-readme.md diff --git a/test/nextcloud/1.6.10/charts/common-2207.0.0.tgz b/test/nextcloud/1.6.11/charts/common-2207.0.0.tgz similarity index 100% rename from test/nextcloud/1.6.10/charts/common-2207.0.0.tgz rename to test/nextcloud/1.6.11/charts/common-2207.0.0.tgz diff --git a/test/nextcloud/1.6.10/ix_values.yaml b/test/nextcloud/1.6.11/ix_values.yaml similarity index 100% rename from test/nextcloud/1.6.10/ix_values.yaml rename to test/nextcloud/1.6.11/ix_values.yaml diff --git a/test/nextcloud/1.6.10/migrations/migrate_from_1.1.0 b/test/nextcloud/1.6.11/migrations/migrate_from_1.1.0 similarity index 100% rename from test/nextcloud/1.6.10/migrations/migrate_from_1.1.0 rename to test/nextcloud/1.6.11/migrations/migrate_from_1.1.0 diff --git a/test/nextcloud/1.6.10/questions.yaml b/test/nextcloud/1.6.11/questions.yaml similarity index 100% rename from test/nextcloud/1.6.10/questions.yaml rename to test/nextcloud/1.6.11/questions.yaml diff --git a/test/nextcloud/1.6.10/requirements.lock b/test/nextcloud/1.6.11/requirements.lock similarity index 100% rename from test/nextcloud/1.6.10/requirements.lock rename to test/nextcloud/1.6.11/requirements.lock diff --git a/test/nextcloud/1.6.10/templates/NOTES.txt b/test/nextcloud/1.6.11/templates/NOTES.txt similarity index 100% rename from test/nextcloud/1.6.10/templates/NOTES.txt rename to test/nextcloud/1.6.11/templates/NOTES.txt diff --git a/test/nextcloud/1.6.10/templates/_nginx.tpl b/test/nextcloud/1.6.11/templates/_nginx.tpl similarity index 100% rename from test/nextcloud/1.6.10/templates/_nginx.tpl rename to test/nextcloud/1.6.11/templates/_nginx.tpl diff --git a/test/nextcloud/1.6.10/templates/_postgres.tpl b/test/nextcloud/1.6.11/templates/_postgres.tpl similarity index 100% rename from test/nextcloud/1.6.10/templates/_postgres.tpl rename to test/nextcloud/1.6.11/templates/_postgres.tpl diff --git a/test/nextcloud/1.6.10/templates/backup-postgres-config.yaml b/test/nextcloud/1.6.11/templates/backup-postgres-config.yaml similarity index 100% rename from test/nextcloud/1.6.10/templates/backup-postgres-config.yaml rename to test/nextcloud/1.6.11/templates/backup-postgres-config.yaml diff --git a/test/nextcloud/1.6.10/templates/backup-postgres-hook.yaml b/test/nextcloud/1.6.11/templates/backup-postgres-hook.yaml similarity index 100% rename from test/nextcloud/1.6.10/templates/backup-postgres-hook.yaml rename to test/nextcloud/1.6.11/templates/backup-postgres-hook.yaml diff --git a/test/nextcloud/1.6.10/templates/cronjob.yaml b/test/nextcloud/1.6.11/templates/cronjob.yaml similarity index 100% rename from test/nextcloud/1.6.10/templates/cronjob.yaml rename to test/nextcloud/1.6.11/templates/cronjob.yaml diff --git a/test/nextcloud/1.6.10/templates/deployment.yaml b/test/nextcloud/1.6.11/templates/deployment.yaml similarity index 93% rename from test/nextcloud/1.6.10/templates/deployment.yaml rename to test/nextcloud/1.6.11/templates/deployment.yaml index 23bf74025d..593e8db419 100644 --- a/test/nextcloud/1.6.10/templates/deployment.yaml +++ b/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 diff --git a/test/nextcloud/1.6.10/templates/nginx-configmap.yaml b/test/nextcloud/1.6.11/templates/nginx-configmap.yaml similarity index 100% rename from test/nextcloud/1.6.10/templates/nginx-configmap.yaml rename to test/nextcloud/1.6.11/templates/nginx-configmap.yaml diff --git a/test/nextcloud/1.6.10/templates/nginx-secret.yaml b/test/nextcloud/1.6.11/templates/nginx-secret.yaml similarity index 100% rename from test/nextcloud/1.6.10/templates/nginx-secret.yaml rename to test/nextcloud/1.6.11/templates/nginx-secret.yaml diff --git a/test/nextcloud/1.6.10/templates/nuke-deployments-hook.yaml b/test/nextcloud/1.6.11/templates/nuke-deployments-hook.yaml similarity index 100% rename from test/nextcloud/1.6.10/templates/nuke-deployments-hook.yaml rename to test/nextcloud/1.6.11/templates/nuke-deployments-hook.yaml diff --git a/test/nextcloud/1.6.10/templates/postgres-deployment.yaml b/test/nextcloud/1.6.11/templates/postgres-deployment.yaml similarity index 100% rename from test/nextcloud/1.6.10/templates/postgres-deployment.yaml rename to test/nextcloud/1.6.11/templates/postgres-deployment.yaml diff --git a/test/nextcloud/1.6.10/templates/postgres-secret.yaml b/test/nextcloud/1.6.11/templates/postgres-secret.yaml similarity index 100% rename from test/nextcloud/1.6.10/templates/postgres-secret.yaml rename to test/nextcloud/1.6.11/templates/postgres-secret.yaml diff --git a/test/nextcloud/1.6.10/templates/postgres-service.yaml b/test/nextcloud/1.6.11/templates/postgres-service.yaml similarity index 100% rename from test/nextcloud/1.6.10/templates/postgres-service.yaml rename to test/nextcloud/1.6.11/templates/postgres-service.yaml diff --git a/test/nextcloud/1.6.10/templates/secrets.yaml b/test/nextcloud/1.6.11/templates/secrets.yaml similarity index 100% rename from test/nextcloud/1.6.10/templates/secrets.yaml rename to test/nextcloud/1.6.11/templates/secrets.yaml diff --git a/test/nextcloud/1.6.10/templates/service.yaml b/test/nextcloud/1.6.11/templates/service.yaml similarity index 100% rename from test/nextcloud/1.6.10/templates/service.yaml rename to test/nextcloud/1.6.11/templates/service.yaml diff --git a/test/nextcloud/1.6.10/templates/serviceaccount.yaml b/test/nextcloud/1.6.11/templates/serviceaccount.yaml similarity index 100% rename from test/nextcloud/1.6.10/templates/serviceaccount.yaml rename to test/nextcloud/1.6.11/templates/serviceaccount.yaml diff --git a/test/nextcloud/1.6.10/templates/tests/deployment-check.yaml b/test/nextcloud/1.6.11/templates/tests/deployment-check.yaml similarity index 100% rename from test/nextcloud/1.6.10/templates/tests/deployment-check.yaml rename to test/nextcloud/1.6.11/templates/tests/deployment-check.yaml diff --git a/test/nextcloud/1.6.10/test_values.yaml b/test/nextcloud/1.6.11/test_values.yaml similarity index 100% rename from test/nextcloud/1.6.10/test_values.yaml rename to test/nextcloud/1.6.11/test_values.yaml