diff --git a/charts/nextcloud/1.6.8/.helmignore b/charts/nextcloud/1.6.9/.helmignore similarity index 100% rename from charts/nextcloud/1.6.8/.helmignore rename to charts/nextcloud/1.6.9/.helmignore diff --git a/charts/nextcloud/1.6.8/Chart.lock b/charts/nextcloud/1.6.9/Chart.lock similarity index 100% rename from charts/nextcloud/1.6.8/Chart.lock rename to charts/nextcloud/1.6.9/Chart.lock diff --git a/charts/nextcloud/1.6.8/Chart.yaml b/charts/nextcloud/1.6.9/Chart.yaml similarity index 97% rename from charts/nextcloud/1.6.8/Chart.yaml rename to charts/nextcloud/1.6.9/Chart.yaml index 070c047096..af2a7c2d98 100644 --- a/charts/nextcloud/1.6.8/Chart.yaml +++ b/charts/nextcloud/1.6.9/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.8 +version: 1.6.9 diff --git a/charts/nextcloud/1.6.8/README.md b/charts/nextcloud/1.6.9/README.md similarity index 100% rename from charts/nextcloud/1.6.8/README.md rename to charts/nextcloud/1.6.9/README.md diff --git a/charts/nextcloud/1.6.8/app-readme.md b/charts/nextcloud/1.6.9/app-readme.md similarity index 100% rename from charts/nextcloud/1.6.8/app-readme.md rename to charts/nextcloud/1.6.9/app-readme.md diff --git a/charts/nextcloud/1.6.8/charts/common-2207.0.0.tgz b/charts/nextcloud/1.6.9/charts/common-2207.0.0.tgz similarity index 100% rename from charts/nextcloud/1.6.8/charts/common-2207.0.0.tgz rename to charts/nextcloud/1.6.9/charts/common-2207.0.0.tgz diff --git a/charts/nextcloud/1.6.8/ix_values.yaml b/charts/nextcloud/1.6.9/ix_values.yaml similarity index 100% rename from charts/nextcloud/1.6.8/ix_values.yaml rename to charts/nextcloud/1.6.9/ix_values.yaml diff --git a/charts/nextcloud/1.6.8/migrations/migrate_from_1.1.0 b/charts/nextcloud/1.6.9/migrations/migrate_from_1.1.0 similarity index 100% rename from charts/nextcloud/1.6.8/migrations/migrate_from_1.1.0 rename to charts/nextcloud/1.6.9/migrations/migrate_from_1.1.0 diff --git a/test/nextcloud/1.6.8/questions.yaml b/charts/nextcloud/1.6.9/questions.yaml similarity index 95% rename from test/nextcloud/1.6.8/questions.yaml rename to charts/nextcloud/1.6.9/questions.yaml index c01c659d31..3d23dece8a 100644 --- a/test/nextcloud/1.6.8/questions.yaml +++ b/charts/nextcloud/1.6.9/questions.yaml @@ -327,3 +327,24 @@ questions: show_if: [["enableResourceLimits", "=", true]] valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" default: "8Gi" + + - variable: environmentVariables + label: "Nextcloud environment" + group: "Nextcloud Configuration" + schema: + type: list + default: [] + items: + - variable: environmentVariable + label: "Environment Variable" + schema: + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string diff --git a/charts/nextcloud/1.6.8/requirements.lock b/charts/nextcloud/1.6.9/requirements.lock similarity index 100% rename from charts/nextcloud/1.6.8/requirements.lock rename to charts/nextcloud/1.6.9/requirements.lock diff --git a/charts/nextcloud/1.6.8/templates/NOTES.txt b/charts/nextcloud/1.6.9/templates/NOTES.txt similarity index 100% rename from charts/nextcloud/1.6.8/templates/NOTES.txt rename to charts/nextcloud/1.6.9/templates/NOTES.txt diff --git a/charts/nextcloud/1.6.8/templates/_nginx.tpl b/charts/nextcloud/1.6.9/templates/_nginx.tpl similarity index 100% rename from charts/nextcloud/1.6.8/templates/_nginx.tpl rename to charts/nextcloud/1.6.9/templates/_nginx.tpl diff --git a/charts/nextcloud/1.6.8/templates/_postgres.tpl b/charts/nextcloud/1.6.9/templates/_postgres.tpl similarity index 100% rename from charts/nextcloud/1.6.8/templates/_postgres.tpl rename to charts/nextcloud/1.6.9/templates/_postgres.tpl diff --git a/charts/nextcloud/1.6.8/templates/backup-postgres-config.yaml b/charts/nextcloud/1.6.9/templates/backup-postgres-config.yaml similarity index 100% rename from charts/nextcloud/1.6.8/templates/backup-postgres-config.yaml rename to charts/nextcloud/1.6.9/templates/backup-postgres-config.yaml diff --git a/charts/nextcloud/1.6.8/templates/backup-postgres-hook.yaml b/charts/nextcloud/1.6.9/templates/backup-postgres-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.8/templates/backup-postgres-hook.yaml rename to charts/nextcloud/1.6.9/templates/backup-postgres-hook.yaml diff --git a/charts/nextcloud/1.6.8/templates/cronjob.yaml b/charts/nextcloud/1.6.9/templates/cronjob.yaml similarity index 100% rename from charts/nextcloud/1.6.8/templates/cronjob.yaml rename to charts/nextcloud/1.6.9/templates/cronjob.yaml diff --git a/test/nextcloud/1.6.8/templates/deployment.yaml b/charts/nextcloud/1.6.9/templates/deployment.yaml similarity index 98% rename from test/nextcloud/1.6.8/templates/deployment.yaml rename to charts/nextcloud/1.6.9/templates/deployment.yaml index d2bc2e02b2..23bf74025d 100644 --- a/test/nextcloud/1.6.8/templates/deployment.yaml +++ b/charts/nextcloud/1.6.9/templates/deployment.yaml @@ -31,8 +31,8 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} {{ include "common.resources.limitation" . | nindent 8 }} {{ include "common.containers.imageConfig" .Values.image | nindent 8 }} env: {{ include "postgres.envVariableConfiguration" $postgres_values | nindent 10 }} - {{ $envList := list }} {{ $secretName := (include "common.names.fullname" .) }} + {{ $envList := (default list .Values.environmentVariables) }} {{ $envList = mustAppend $envList (dict "name" "POSTGRES_HOST" "value" (printf "%s:5432" (include "common.names.fullname" $postgres_values))) }} {{ $envList = mustAppend $envList (dict "name" "POSTGRES_DB" "value" (include "postgres.DatabaseName" .)) }} {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_DATA_DIR" "value" .Values.nextcloud.datadir) }} diff --git a/charts/nextcloud/1.6.8/templates/nginx-configmap.yaml b/charts/nextcloud/1.6.9/templates/nginx-configmap.yaml similarity index 100% rename from charts/nextcloud/1.6.8/templates/nginx-configmap.yaml rename to charts/nextcloud/1.6.9/templates/nginx-configmap.yaml diff --git a/charts/nextcloud/1.6.8/templates/nginx-secret.yaml b/charts/nextcloud/1.6.9/templates/nginx-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.8/templates/nginx-secret.yaml rename to charts/nextcloud/1.6.9/templates/nginx-secret.yaml diff --git a/charts/nextcloud/1.6.8/templates/nuke-deployments-hook.yaml b/charts/nextcloud/1.6.9/templates/nuke-deployments-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.8/templates/nuke-deployments-hook.yaml rename to charts/nextcloud/1.6.9/templates/nuke-deployments-hook.yaml diff --git a/charts/nextcloud/1.6.8/templates/postgres-deployment.yaml b/charts/nextcloud/1.6.9/templates/postgres-deployment.yaml similarity index 100% rename from charts/nextcloud/1.6.8/templates/postgres-deployment.yaml rename to charts/nextcloud/1.6.9/templates/postgres-deployment.yaml diff --git a/charts/nextcloud/1.6.8/templates/postgres-secret.yaml b/charts/nextcloud/1.6.9/templates/postgres-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.8/templates/postgres-secret.yaml rename to charts/nextcloud/1.6.9/templates/postgres-secret.yaml diff --git a/charts/nextcloud/1.6.8/templates/postgres-service.yaml b/charts/nextcloud/1.6.9/templates/postgres-service.yaml similarity index 100% rename from charts/nextcloud/1.6.8/templates/postgres-service.yaml rename to charts/nextcloud/1.6.9/templates/postgres-service.yaml diff --git a/charts/nextcloud/1.6.8/templates/secrets.yaml b/charts/nextcloud/1.6.9/templates/secrets.yaml similarity index 100% rename from charts/nextcloud/1.6.8/templates/secrets.yaml rename to charts/nextcloud/1.6.9/templates/secrets.yaml diff --git a/charts/nextcloud/1.6.8/templates/service.yaml b/charts/nextcloud/1.6.9/templates/service.yaml similarity index 100% rename from charts/nextcloud/1.6.8/templates/service.yaml rename to charts/nextcloud/1.6.9/templates/service.yaml diff --git a/charts/nextcloud/1.6.8/templates/serviceaccount.yaml b/charts/nextcloud/1.6.9/templates/serviceaccount.yaml similarity index 100% rename from charts/nextcloud/1.6.8/templates/serviceaccount.yaml rename to charts/nextcloud/1.6.9/templates/serviceaccount.yaml diff --git a/charts/nextcloud/1.6.8/templates/tests/deployment-check.yaml b/charts/nextcloud/1.6.9/templates/tests/deployment-check.yaml similarity index 100% rename from charts/nextcloud/1.6.8/templates/tests/deployment-check.yaml rename to charts/nextcloud/1.6.9/templates/tests/deployment-check.yaml diff --git a/test/nextcloud/1.6.8/test_values.yaml b/charts/nextcloud/1.6.9/test_values.yaml similarity index 99% rename from test/nextcloud/1.6.8/test_values.yaml rename to charts/nextcloud/1.6.9/test_values.yaml index 953b30be31..158ccd3569 100644 --- a/test/nextcloud/1.6.8/test_values.yaml +++ b/charts/nextcloud/1.6.9/test_values.yaml @@ -42,3 +42,4 @@ service: nodePort: 31000 updateStrategy: Recreate useServiceNameForHost: true + diff --git a/test/nextcloud/1.6.8/.helmignore b/test/nextcloud/1.6.9/.helmignore similarity index 100% rename from test/nextcloud/1.6.8/.helmignore rename to test/nextcloud/1.6.9/.helmignore diff --git a/test/nextcloud/1.6.8/Chart.lock b/test/nextcloud/1.6.9/Chart.lock similarity index 100% rename from test/nextcloud/1.6.8/Chart.lock rename to test/nextcloud/1.6.9/Chart.lock diff --git a/test/nextcloud/1.6.8/Chart.yaml b/test/nextcloud/1.6.9/Chart.yaml similarity index 97% rename from test/nextcloud/1.6.8/Chart.yaml rename to test/nextcloud/1.6.9/Chart.yaml index 070c047096..af2a7c2d98 100644 --- a/test/nextcloud/1.6.8/Chart.yaml +++ b/test/nextcloud/1.6.9/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.8 +version: 1.6.9 diff --git a/test/nextcloud/1.6.8/README.md b/test/nextcloud/1.6.9/README.md similarity index 100% rename from test/nextcloud/1.6.8/README.md rename to test/nextcloud/1.6.9/README.md diff --git a/test/nextcloud/1.6.8/app-readme.md b/test/nextcloud/1.6.9/app-readme.md similarity index 100% rename from test/nextcloud/1.6.8/app-readme.md rename to test/nextcloud/1.6.9/app-readme.md diff --git a/test/nextcloud/1.6.8/charts/common-2207.0.0.tgz b/test/nextcloud/1.6.9/charts/common-2207.0.0.tgz similarity index 100% rename from test/nextcloud/1.6.8/charts/common-2207.0.0.tgz rename to test/nextcloud/1.6.9/charts/common-2207.0.0.tgz diff --git a/test/nextcloud/1.6.8/ix_values.yaml b/test/nextcloud/1.6.9/ix_values.yaml similarity index 100% rename from test/nextcloud/1.6.8/ix_values.yaml rename to test/nextcloud/1.6.9/ix_values.yaml diff --git a/test/nextcloud/1.6.8/migrations/migrate_from_1.1.0 b/test/nextcloud/1.6.9/migrations/migrate_from_1.1.0 similarity index 100% rename from test/nextcloud/1.6.8/migrations/migrate_from_1.1.0 rename to test/nextcloud/1.6.9/migrations/migrate_from_1.1.0 diff --git a/charts/nextcloud/1.6.8/questions.yaml b/test/nextcloud/1.6.9/questions.yaml similarity index 95% rename from charts/nextcloud/1.6.8/questions.yaml rename to test/nextcloud/1.6.9/questions.yaml index c01c659d31..3d23dece8a 100644 --- a/charts/nextcloud/1.6.8/questions.yaml +++ b/test/nextcloud/1.6.9/questions.yaml @@ -327,3 +327,24 @@ questions: show_if: [["enableResourceLimits", "=", true]] valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" default: "8Gi" + + - variable: environmentVariables + label: "Nextcloud environment" + group: "Nextcloud Configuration" + schema: + type: list + default: [] + items: + - variable: environmentVariable + label: "Environment Variable" + schema: + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string diff --git a/test/nextcloud/1.6.8/requirements.lock b/test/nextcloud/1.6.9/requirements.lock similarity index 100% rename from test/nextcloud/1.6.8/requirements.lock rename to test/nextcloud/1.6.9/requirements.lock diff --git a/test/nextcloud/1.6.8/templates/NOTES.txt b/test/nextcloud/1.6.9/templates/NOTES.txt similarity index 100% rename from test/nextcloud/1.6.8/templates/NOTES.txt rename to test/nextcloud/1.6.9/templates/NOTES.txt diff --git a/test/nextcloud/1.6.8/templates/_nginx.tpl b/test/nextcloud/1.6.9/templates/_nginx.tpl similarity index 100% rename from test/nextcloud/1.6.8/templates/_nginx.tpl rename to test/nextcloud/1.6.9/templates/_nginx.tpl diff --git a/test/nextcloud/1.6.8/templates/_postgres.tpl b/test/nextcloud/1.6.9/templates/_postgres.tpl similarity index 100% rename from test/nextcloud/1.6.8/templates/_postgres.tpl rename to test/nextcloud/1.6.9/templates/_postgres.tpl diff --git a/test/nextcloud/1.6.8/templates/backup-postgres-config.yaml b/test/nextcloud/1.6.9/templates/backup-postgres-config.yaml similarity index 100% rename from test/nextcloud/1.6.8/templates/backup-postgres-config.yaml rename to test/nextcloud/1.6.9/templates/backup-postgres-config.yaml diff --git a/test/nextcloud/1.6.8/templates/backup-postgres-hook.yaml b/test/nextcloud/1.6.9/templates/backup-postgres-hook.yaml similarity index 100% rename from test/nextcloud/1.6.8/templates/backup-postgres-hook.yaml rename to test/nextcloud/1.6.9/templates/backup-postgres-hook.yaml diff --git a/test/nextcloud/1.6.8/templates/cronjob.yaml b/test/nextcloud/1.6.9/templates/cronjob.yaml similarity index 100% rename from test/nextcloud/1.6.8/templates/cronjob.yaml rename to test/nextcloud/1.6.9/templates/cronjob.yaml diff --git a/charts/nextcloud/1.6.8/templates/deployment.yaml b/test/nextcloud/1.6.9/templates/deployment.yaml similarity index 98% rename from charts/nextcloud/1.6.8/templates/deployment.yaml rename to test/nextcloud/1.6.9/templates/deployment.yaml index d2bc2e02b2..23bf74025d 100644 --- a/charts/nextcloud/1.6.8/templates/deployment.yaml +++ b/test/nextcloud/1.6.9/templates/deployment.yaml @@ -31,8 +31,8 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} {{ include "common.resources.limitation" . | nindent 8 }} {{ include "common.containers.imageConfig" .Values.image | nindent 8 }} env: {{ include "postgres.envVariableConfiguration" $postgres_values | nindent 10 }} - {{ $envList := list }} {{ $secretName := (include "common.names.fullname" .) }} + {{ $envList := (default list .Values.environmentVariables) }} {{ $envList = mustAppend $envList (dict "name" "POSTGRES_HOST" "value" (printf "%s:5432" (include "common.names.fullname" $postgres_values))) }} {{ $envList = mustAppend $envList (dict "name" "POSTGRES_DB" "value" (include "postgres.DatabaseName" .)) }} {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_DATA_DIR" "value" .Values.nextcloud.datadir) }} diff --git a/test/nextcloud/1.6.8/templates/nginx-configmap.yaml b/test/nextcloud/1.6.9/templates/nginx-configmap.yaml similarity index 100% rename from test/nextcloud/1.6.8/templates/nginx-configmap.yaml rename to test/nextcloud/1.6.9/templates/nginx-configmap.yaml diff --git a/test/nextcloud/1.6.8/templates/nginx-secret.yaml b/test/nextcloud/1.6.9/templates/nginx-secret.yaml similarity index 100% rename from test/nextcloud/1.6.8/templates/nginx-secret.yaml rename to test/nextcloud/1.6.9/templates/nginx-secret.yaml diff --git a/test/nextcloud/1.6.8/templates/nuke-deployments-hook.yaml b/test/nextcloud/1.6.9/templates/nuke-deployments-hook.yaml similarity index 100% rename from test/nextcloud/1.6.8/templates/nuke-deployments-hook.yaml rename to test/nextcloud/1.6.9/templates/nuke-deployments-hook.yaml diff --git a/test/nextcloud/1.6.8/templates/postgres-deployment.yaml b/test/nextcloud/1.6.9/templates/postgres-deployment.yaml similarity index 100% rename from test/nextcloud/1.6.8/templates/postgres-deployment.yaml rename to test/nextcloud/1.6.9/templates/postgres-deployment.yaml diff --git a/test/nextcloud/1.6.8/templates/postgres-secret.yaml b/test/nextcloud/1.6.9/templates/postgres-secret.yaml similarity index 100% rename from test/nextcloud/1.6.8/templates/postgres-secret.yaml rename to test/nextcloud/1.6.9/templates/postgres-secret.yaml diff --git a/test/nextcloud/1.6.8/templates/postgres-service.yaml b/test/nextcloud/1.6.9/templates/postgres-service.yaml similarity index 100% rename from test/nextcloud/1.6.8/templates/postgres-service.yaml rename to test/nextcloud/1.6.9/templates/postgres-service.yaml diff --git a/test/nextcloud/1.6.8/templates/secrets.yaml b/test/nextcloud/1.6.9/templates/secrets.yaml similarity index 100% rename from test/nextcloud/1.6.8/templates/secrets.yaml rename to test/nextcloud/1.6.9/templates/secrets.yaml diff --git a/test/nextcloud/1.6.8/templates/service.yaml b/test/nextcloud/1.6.9/templates/service.yaml similarity index 100% rename from test/nextcloud/1.6.8/templates/service.yaml rename to test/nextcloud/1.6.9/templates/service.yaml diff --git a/test/nextcloud/1.6.8/templates/serviceaccount.yaml b/test/nextcloud/1.6.9/templates/serviceaccount.yaml similarity index 100% rename from test/nextcloud/1.6.8/templates/serviceaccount.yaml rename to test/nextcloud/1.6.9/templates/serviceaccount.yaml diff --git a/test/nextcloud/1.6.8/templates/tests/deployment-check.yaml b/test/nextcloud/1.6.9/templates/tests/deployment-check.yaml similarity index 100% rename from test/nextcloud/1.6.8/templates/tests/deployment-check.yaml rename to test/nextcloud/1.6.9/templates/tests/deployment-check.yaml diff --git a/charts/nextcloud/1.6.8/test_values.yaml b/test/nextcloud/1.6.9/test_values.yaml similarity index 100% rename from charts/nextcloud/1.6.8/test_values.yaml rename to test/nextcloud/1.6.9/test_values.yaml