diff --git a/charts/nextcloud/1.6.14/templates/postgres-secret.yaml b/charts/nextcloud/1.6.14/templates/postgres-secret.yaml deleted file mode 100644 index 6b08b701a9..0000000000 --- a/charts/nextcloud/1.6.14/templates/postgres-secret.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: db-details -data: - db-user: postgres - {{- if .Release.IsInstall }} - db-password: {{ randAlphaNum 15 | b64enc | quote }} - {{ else }} - # `index` function is necessary because the property name contains a dash. - # Otherwise (...).data.db_password would have worked too. - db-password: {{ index (lookup "v1" "Secret" .Release.Namespace "db-details").data "db-password" }} - {{ end }} diff --git a/charts/nextcloud/1.6.14/.helmignore b/charts/nextcloud/1.6.15/.helmignore similarity index 100% rename from charts/nextcloud/1.6.14/.helmignore rename to charts/nextcloud/1.6.15/.helmignore diff --git a/charts/nextcloud/1.6.14/Chart.lock b/charts/nextcloud/1.6.15/Chart.lock similarity index 100% rename from charts/nextcloud/1.6.14/Chart.lock rename to charts/nextcloud/1.6.15/Chart.lock diff --git a/charts/nextcloud/1.6.14/Chart.yaml b/charts/nextcloud/1.6.15/Chart.yaml similarity index 93% rename from charts/nextcloud/1.6.14/Chart.yaml rename to charts/nextcloud/1.6.15/Chart.yaml index 1ef1e76d66..0104ebc5fc 100644 --- a/charts/nextcloud/1.6.14/Chart.yaml +++ b/charts/nextcloud/1.6.15/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 25.0.1 +appVersion: 25.0.2 dependencies: - name: common repository: file://../../../library/common/2207.0.0 @@ -19,4 +19,4 @@ sources: - https://github.com/nextcloud/docker - https://github.com/nextcloud/helm upstream_version: 2.3.2 -version: 1.6.14 +version: 1.6.15 diff --git a/charts/nextcloud/1.6.14/README.md b/charts/nextcloud/1.6.15/README.md similarity index 100% rename from charts/nextcloud/1.6.14/README.md rename to charts/nextcloud/1.6.15/README.md diff --git a/charts/nextcloud/1.6.14/app-readme.md b/charts/nextcloud/1.6.15/app-readme.md similarity index 100% rename from charts/nextcloud/1.6.14/app-readme.md rename to charts/nextcloud/1.6.15/app-readme.md diff --git a/charts/nextcloud/1.6.14/charts/common-2207.0.0.tgz b/charts/nextcloud/1.6.15/charts/common-2207.0.0.tgz similarity index 100% rename from charts/nextcloud/1.6.14/charts/common-2207.0.0.tgz rename to charts/nextcloud/1.6.15/charts/common-2207.0.0.tgz diff --git a/test/nextcloud/1.6.14/ix_values.yaml b/charts/nextcloud/1.6.15/ix_values.yaml similarity index 83% rename from test/nextcloud/1.6.14/ix_values.yaml rename to charts/nextcloud/1.6.15/ix_values.yaml index 486755561d..24472de1fd 100644 --- a/test/nextcloud/1.6.14/ix_values.yaml +++ b/charts/nextcloud/1.6.15/ix_values.yaml @@ -1,10 +1,10 @@ image: pullPolicy: IfNotPresent repository: nextcloud - tag: 25.0.1 + tag: 25.0.2 nginx: image: pullPolicy: IfNotPresent repository: nginx - tag: 1.21.3 + tag: 1.23.3 useServiceNameForHost: false diff --git a/charts/nextcloud/1.6.14/migrations/migrate_from_1.1.0 b/charts/nextcloud/1.6.15/migrations/migrate_from_1.1.0 similarity index 100% rename from charts/nextcloud/1.6.14/migrations/migrate_from_1.1.0 rename to charts/nextcloud/1.6.15/migrations/migrate_from_1.1.0 diff --git a/charts/nextcloud/1.6.14/questions.yaml b/charts/nextcloud/1.6.15/questions.yaml similarity index 100% rename from charts/nextcloud/1.6.14/questions.yaml rename to charts/nextcloud/1.6.15/questions.yaml diff --git a/charts/nextcloud/1.6.14/requirements.lock b/charts/nextcloud/1.6.15/requirements.lock similarity index 100% rename from charts/nextcloud/1.6.14/requirements.lock rename to charts/nextcloud/1.6.15/requirements.lock diff --git a/charts/nextcloud/1.6.14/templates/NOTES.txt b/charts/nextcloud/1.6.15/templates/NOTES.txt similarity index 100% rename from charts/nextcloud/1.6.14/templates/NOTES.txt rename to charts/nextcloud/1.6.15/templates/NOTES.txt diff --git a/charts/nextcloud/1.6.14/templates/_nginx.tpl b/charts/nextcloud/1.6.15/templates/_nginx.tpl similarity index 100% rename from charts/nextcloud/1.6.14/templates/_nginx.tpl rename to charts/nextcloud/1.6.15/templates/_nginx.tpl diff --git a/charts/nextcloud/1.6.14/templates/_postgres.tpl b/charts/nextcloud/1.6.15/templates/_postgres.tpl similarity index 100% rename from charts/nextcloud/1.6.14/templates/_postgres.tpl rename to charts/nextcloud/1.6.15/templates/_postgres.tpl diff --git a/charts/nextcloud/1.6.14/templates/backup-postgres-config.yaml b/charts/nextcloud/1.6.15/templates/backup-postgres-config.yaml similarity index 100% rename from charts/nextcloud/1.6.14/templates/backup-postgres-config.yaml rename to charts/nextcloud/1.6.15/templates/backup-postgres-config.yaml diff --git a/charts/nextcloud/1.6.14/templates/backup-postgres-hook.yaml b/charts/nextcloud/1.6.15/templates/backup-postgres-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.14/templates/backup-postgres-hook.yaml rename to charts/nextcloud/1.6.15/templates/backup-postgres-hook.yaml diff --git a/charts/nextcloud/1.6.14/templates/cronjob.yaml b/charts/nextcloud/1.6.15/templates/cronjob.yaml similarity index 100% rename from charts/nextcloud/1.6.14/templates/cronjob.yaml rename to charts/nextcloud/1.6.15/templates/cronjob.yaml diff --git a/charts/nextcloud/1.6.14/templates/deployment.yaml b/charts/nextcloud/1.6.15/templates/deployment.yaml similarity index 100% rename from charts/nextcloud/1.6.14/templates/deployment.yaml rename to charts/nextcloud/1.6.15/templates/deployment.yaml diff --git a/charts/nextcloud/1.6.14/templates/nginx-configmap.yaml b/charts/nextcloud/1.6.15/templates/nginx-configmap.yaml similarity index 100% rename from charts/nextcloud/1.6.14/templates/nginx-configmap.yaml rename to charts/nextcloud/1.6.15/templates/nginx-configmap.yaml diff --git a/charts/nextcloud/1.6.14/templates/nginx-secret.yaml b/charts/nextcloud/1.6.15/templates/nginx-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.14/templates/nginx-secret.yaml rename to charts/nextcloud/1.6.15/templates/nginx-secret.yaml diff --git a/charts/nextcloud/1.6.14/templates/nuke-deployments-hook.yaml b/charts/nextcloud/1.6.15/templates/nuke-deployments-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.14/templates/nuke-deployments-hook.yaml rename to charts/nextcloud/1.6.15/templates/nuke-deployments-hook.yaml diff --git a/charts/nextcloud/1.6.14/templates/postgres-deployment.yaml b/charts/nextcloud/1.6.15/templates/postgres-deployment.yaml similarity index 100% rename from charts/nextcloud/1.6.14/templates/postgres-deployment.yaml rename to charts/nextcloud/1.6.15/templates/postgres-deployment.yaml diff --git a/charts/nextcloud/1.6.15/templates/postgres-secret.yaml b/charts/nextcloud/1.6.15/templates/postgres-secret.yaml new file mode 100644 index 0000000000..2a017f922a --- /dev/null +++ b/charts/nextcloud/1.6.15/templates/postgres-secret.yaml @@ -0,0 +1,12 @@ +{{- $secretName := "db-details" }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ $secretName }} +data: + db-user: {{ "postgres" | b64enc }} + {{ with (lookup "v1" "Secret" .Release.Namespace $secretName) }} + db-password: {{ index .data "db-password" }} + {{ else }} + db-password: {{ randAlphaNum 15 | b64enc }} + {{ end }} diff --git a/charts/nextcloud/1.6.14/templates/postgres-service.yaml b/charts/nextcloud/1.6.15/templates/postgres-service.yaml similarity index 100% rename from charts/nextcloud/1.6.14/templates/postgres-service.yaml rename to charts/nextcloud/1.6.15/templates/postgres-service.yaml diff --git a/charts/nextcloud/1.6.14/templates/secrets.yaml b/charts/nextcloud/1.6.15/templates/secrets.yaml similarity index 100% rename from charts/nextcloud/1.6.14/templates/secrets.yaml rename to charts/nextcloud/1.6.15/templates/secrets.yaml diff --git a/charts/nextcloud/1.6.14/templates/service.yaml b/charts/nextcloud/1.6.15/templates/service.yaml similarity index 100% rename from charts/nextcloud/1.6.14/templates/service.yaml rename to charts/nextcloud/1.6.15/templates/service.yaml diff --git a/charts/nextcloud/1.6.14/templates/serviceaccount.yaml b/charts/nextcloud/1.6.15/templates/serviceaccount.yaml similarity index 100% rename from charts/nextcloud/1.6.14/templates/serviceaccount.yaml rename to charts/nextcloud/1.6.15/templates/serviceaccount.yaml diff --git a/charts/nextcloud/1.6.14/templates/tests/deployment-check.yaml b/charts/nextcloud/1.6.15/templates/tests/deployment-check.yaml similarity index 100% rename from charts/nextcloud/1.6.14/templates/tests/deployment-check.yaml rename to charts/nextcloud/1.6.15/templates/tests/deployment-check.yaml diff --git a/test/nextcloud/1.6.14/test_values.yaml b/charts/nextcloud/1.6.15/test_values.yaml similarity index 96% rename from test/nextcloud/1.6.14/test_values.yaml rename to charts/nextcloud/1.6.15/test_values.yaml index d6577a2b24..0a8410f41b 100644 --- a/test/nextcloud/1.6.14/test_values.yaml +++ b/charts/nextcloud/1.6.15/test_values.yaml @@ -12,7 +12,7 @@ environmentVariables: [] image: pullPolicy: IfNotPresent repository: nextcloud - tag: 25.0.1 + tag: 25.0.2 ixChartContext: {} nextcloud: datadir: /var/www/html/data @@ -23,7 +23,7 @@ nginx: image: pullPolicy: IfNotPresent repository: nginx - tag: 1.21.3 + tag: 1.23.3 postgresAppVolumeMounts: postgres-backup: emptyDir: true diff --git a/test/nextcloud/1.6.14/templates/postgres-secret.yaml b/test/nextcloud/1.6.14/templates/postgres-secret.yaml deleted file mode 100644 index 6b08b701a9..0000000000 --- a/test/nextcloud/1.6.14/templates/postgres-secret.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: db-details -data: - db-user: postgres - {{- if .Release.IsInstall }} - db-password: {{ randAlphaNum 15 | b64enc | quote }} - {{ else }} - # `index` function is necessary because the property name contains a dash. - # Otherwise (...).data.db_password would have worked too. - db-password: {{ index (lookup "v1" "Secret" .Release.Namespace "db-details").data "db-password" }} - {{ end }} diff --git a/test/nextcloud/1.6.14/.helmignore b/test/nextcloud/1.6.15/.helmignore similarity index 100% rename from test/nextcloud/1.6.14/.helmignore rename to test/nextcloud/1.6.15/.helmignore diff --git a/test/nextcloud/1.6.14/Chart.lock b/test/nextcloud/1.6.15/Chart.lock similarity index 100% rename from test/nextcloud/1.6.14/Chart.lock rename to test/nextcloud/1.6.15/Chart.lock diff --git a/test/nextcloud/1.6.14/Chart.yaml b/test/nextcloud/1.6.15/Chart.yaml similarity index 93% rename from test/nextcloud/1.6.14/Chart.yaml rename to test/nextcloud/1.6.15/Chart.yaml index 1ef1e76d66..0104ebc5fc 100644 --- a/test/nextcloud/1.6.14/Chart.yaml +++ b/test/nextcloud/1.6.15/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 25.0.1 +appVersion: 25.0.2 dependencies: - name: common repository: file://../../../library/common/2207.0.0 @@ -19,4 +19,4 @@ sources: - https://github.com/nextcloud/docker - https://github.com/nextcloud/helm upstream_version: 2.3.2 -version: 1.6.14 +version: 1.6.15 diff --git a/test/nextcloud/1.6.14/README.md b/test/nextcloud/1.6.15/README.md similarity index 100% rename from test/nextcloud/1.6.14/README.md rename to test/nextcloud/1.6.15/README.md diff --git a/test/nextcloud/1.6.14/app-readme.md b/test/nextcloud/1.6.15/app-readme.md similarity index 100% rename from test/nextcloud/1.6.14/app-readme.md rename to test/nextcloud/1.6.15/app-readme.md diff --git a/test/nextcloud/1.6.14/charts/common-2207.0.0.tgz b/test/nextcloud/1.6.15/charts/common-2207.0.0.tgz similarity index 100% rename from test/nextcloud/1.6.14/charts/common-2207.0.0.tgz rename to test/nextcloud/1.6.15/charts/common-2207.0.0.tgz diff --git a/charts/nextcloud/1.6.14/ix_values.yaml b/test/nextcloud/1.6.15/ix_values.yaml similarity index 83% rename from charts/nextcloud/1.6.14/ix_values.yaml rename to test/nextcloud/1.6.15/ix_values.yaml index 486755561d..24472de1fd 100644 --- a/charts/nextcloud/1.6.14/ix_values.yaml +++ b/test/nextcloud/1.6.15/ix_values.yaml @@ -1,10 +1,10 @@ image: pullPolicy: IfNotPresent repository: nextcloud - tag: 25.0.1 + tag: 25.0.2 nginx: image: pullPolicy: IfNotPresent repository: nginx - tag: 1.21.3 + tag: 1.23.3 useServiceNameForHost: false diff --git a/test/nextcloud/1.6.14/migrations/migrate_from_1.1.0 b/test/nextcloud/1.6.15/migrations/migrate_from_1.1.0 similarity index 100% rename from test/nextcloud/1.6.14/migrations/migrate_from_1.1.0 rename to test/nextcloud/1.6.15/migrations/migrate_from_1.1.0 diff --git a/test/nextcloud/1.6.14/questions.yaml b/test/nextcloud/1.6.15/questions.yaml similarity index 100% rename from test/nextcloud/1.6.14/questions.yaml rename to test/nextcloud/1.6.15/questions.yaml diff --git a/test/nextcloud/1.6.14/requirements.lock b/test/nextcloud/1.6.15/requirements.lock similarity index 100% rename from test/nextcloud/1.6.14/requirements.lock rename to test/nextcloud/1.6.15/requirements.lock diff --git a/test/nextcloud/1.6.14/templates/NOTES.txt b/test/nextcloud/1.6.15/templates/NOTES.txt similarity index 100% rename from test/nextcloud/1.6.14/templates/NOTES.txt rename to test/nextcloud/1.6.15/templates/NOTES.txt diff --git a/test/nextcloud/1.6.14/templates/_nginx.tpl b/test/nextcloud/1.6.15/templates/_nginx.tpl similarity index 100% rename from test/nextcloud/1.6.14/templates/_nginx.tpl rename to test/nextcloud/1.6.15/templates/_nginx.tpl diff --git a/test/nextcloud/1.6.14/templates/_postgres.tpl b/test/nextcloud/1.6.15/templates/_postgres.tpl similarity index 100% rename from test/nextcloud/1.6.14/templates/_postgres.tpl rename to test/nextcloud/1.6.15/templates/_postgres.tpl diff --git a/test/nextcloud/1.6.14/templates/backup-postgres-config.yaml b/test/nextcloud/1.6.15/templates/backup-postgres-config.yaml similarity index 100% rename from test/nextcloud/1.6.14/templates/backup-postgres-config.yaml rename to test/nextcloud/1.6.15/templates/backup-postgres-config.yaml diff --git a/test/nextcloud/1.6.14/templates/backup-postgres-hook.yaml b/test/nextcloud/1.6.15/templates/backup-postgres-hook.yaml similarity index 100% rename from test/nextcloud/1.6.14/templates/backup-postgres-hook.yaml rename to test/nextcloud/1.6.15/templates/backup-postgres-hook.yaml diff --git a/test/nextcloud/1.6.14/templates/cronjob.yaml b/test/nextcloud/1.6.15/templates/cronjob.yaml similarity index 100% rename from test/nextcloud/1.6.14/templates/cronjob.yaml rename to test/nextcloud/1.6.15/templates/cronjob.yaml diff --git a/test/nextcloud/1.6.14/templates/deployment.yaml b/test/nextcloud/1.6.15/templates/deployment.yaml similarity index 100% rename from test/nextcloud/1.6.14/templates/deployment.yaml rename to test/nextcloud/1.6.15/templates/deployment.yaml diff --git a/test/nextcloud/1.6.14/templates/nginx-configmap.yaml b/test/nextcloud/1.6.15/templates/nginx-configmap.yaml similarity index 100% rename from test/nextcloud/1.6.14/templates/nginx-configmap.yaml rename to test/nextcloud/1.6.15/templates/nginx-configmap.yaml diff --git a/test/nextcloud/1.6.14/templates/nginx-secret.yaml b/test/nextcloud/1.6.15/templates/nginx-secret.yaml similarity index 100% rename from test/nextcloud/1.6.14/templates/nginx-secret.yaml rename to test/nextcloud/1.6.15/templates/nginx-secret.yaml diff --git a/test/nextcloud/1.6.14/templates/nuke-deployments-hook.yaml b/test/nextcloud/1.6.15/templates/nuke-deployments-hook.yaml similarity index 100% rename from test/nextcloud/1.6.14/templates/nuke-deployments-hook.yaml rename to test/nextcloud/1.6.15/templates/nuke-deployments-hook.yaml diff --git a/test/nextcloud/1.6.14/templates/postgres-deployment.yaml b/test/nextcloud/1.6.15/templates/postgres-deployment.yaml similarity index 100% rename from test/nextcloud/1.6.14/templates/postgres-deployment.yaml rename to test/nextcloud/1.6.15/templates/postgres-deployment.yaml diff --git a/test/nextcloud/1.6.15/templates/postgres-secret.yaml b/test/nextcloud/1.6.15/templates/postgres-secret.yaml new file mode 100644 index 0000000000..2a017f922a --- /dev/null +++ b/test/nextcloud/1.6.15/templates/postgres-secret.yaml @@ -0,0 +1,12 @@ +{{- $secretName := "db-details" }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ $secretName }} +data: + db-user: {{ "postgres" | b64enc }} + {{ with (lookup "v1" "Secret" .Release.Namespace $secretName) }} + db-password: {{ index .data "db-password" }} + {{ else }} + db-password: {{ randAlphaNum 15 | b64enc }} + {{ end }} diff --git a/test/nextcloud/1.6.14/templates/postgres-service.yaml b/test/nextcloud/1.6.15/templates/postgres-service.yaml similarity index 100% rename from test/nextcloud/1.6.14/templates/postgres-service.yaml rename to test/nextcloud/1.6.15/templates/postgres-service.yaml diff --git a/test/nextcloud/1.6.14/templates/secrets.yaml b/test/nextcloud/1.6.15/templates/secrets.yaml similarity index 100% rename from test/nextcloud/1.6.14/templates/secrets.yaml rename to test/nextcloud/1.6.15/templates/secrets.yaml diff --git a/test/nextcloud/1.6.14/templates/service.yaml b/test/nextcloud/1.6.15/templates/service.yaml similarity index 100% rename from test/nextcloud/1.6.14/templates/service.yaml rename to test/nextcloud/1.6.15/templates/service.yaml diff --git a/test/nextcloud/1.6.14/templates/serviceaccount.yaml b/test/nextcloud/1.6.15/templates/serviceaccount.yaml similarity index 100% rename from test/nextcloud/1.6.14/templates/serviceaccount.yaml rename to test/nextcloud/1.6.15/templates/serviceaccount.yaml diff --git a/test/nextcloud/1.6.14/templates/tests/deployment-check.yaml b/test/nextcloud/1.6.15/templates/tests/deployment-check.yaml similarity index 100% rename from test/nextcloud/1.6.14/templates/tests/deployment-check.yaml rename to test/nextcloud/1.6.15/templates/tests/deployment-check.yaml diff --git a/charts/nextcloud/1.6.14/test_values.yaml b/test/nextcloud/1.6.15/test_values.yaml similarity index 96% rename from charts/nextcloud/1.6.14/test_values.yaml rename to test/nextcloud/1.6.15/test_values.yaml index d6577a2b24..0a8410f41b 100644 --- a/charts/nextcloud/1.6.14/test_values.yaml +++ b/test/nextcloud/1.6.15/test_values.yaml @@ -12,7 +12,7 @@ environmentVariables: [] image: pullPolicy: IfNotPresent repository: nextcloud - tag: 25.0.1 + tag: 25.0.2 ixChartContext: {} nextcloud: datadir: /var/www/html/data @@ -23,7 +23,7 @@ nginx: image: pullPolicy: IfNotPresent repository: nginx - tag: 1.21.3 + tag: 1.23.3 postgresAppVolumeMounts: postgres-backup: emptyDir: true