From 78778c53e82bb33d36727b305c180462611da660 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Tue, 27 Aug 2024 16:26:14 +0000 Subject: [PATCH] Publish new changes in catalog --- charts/nextcloud/{2.0.13 => 2.0.14}/.helmignore | 0 charts/nextcloud/{2.0.13 => 2.0.14}/Chart.lock | 0 charts/nextcloud/{2.0.13 => 2.0.14}/Chart.yaml | 2 +- charts/nextcloud/{2.0.13 => 2.0.14}/README.md | 0 charts/nextcloud/{2.0.13 => 2.0.14}/app-readme.md | 0 .../{2.0.13 => 2.0.14}/charts/common-1.2.9.tgz | Bin .../{2.0.13 => 2.0.14}/ci/basic-values.yaml | 0 .../{2.0.13 => 2.0.14}/ci/https-values.yaml | 0 charts/nextcloud/{2.0.13 => 2.0.14}/ci/no-cron.yaml | 0 .../{2.0.13 => 2.0.14}/ci/nocmd-values.yaml | 0 .../{2.0.13 => 2.0.14}/ci/onedata-values.yaml | 0 charts/nextcloud/{2.0.13 => 2.0.14}/ix_values.yaml | 0 charts/nextcloud/{2.0.13 => 2.0.14}/metadata.yaml | 0 .../nextcloud/{2.0.13 => 2.0.14}/migrations/migrate | 0 charts/nextcloud/{2.0.13 => 2.0.14}/questions.yaml | 0 .../{2.0.13 => 2.0.14}/templates/NOTES.txt | 0 .../{2.0.13 => 2.0.14}/templates/_configuration.tpl | 0 .../{2.0.13 => 2.0.14}/templates/_cron.tpl | 0 .../{2.0.13 => 2.0.14}/templates/_migration.tpl | 0 .../templates/_nextcloud-configs.tpl | 0 .../{2.0.13 => 2.0.14}/templates/_nextcloud.tpl | 0 .../templates/_nginx-configuration.tpl | 0 .../{2.0.13 => 2.0.14}/templates/_nginx.tpl | 0 .../{2.0.13 => 2.0.14}/templates/_persistence.tpl | 0 .../{2.0.13 => 2.0.14}/templates/_portal.tpl | 12 ++++++++---- .../{2.0.13 => 2.0.14}/templates/_postgres.tpl | 0 .../{2.0.13 => 2.0.14}/templates/_redis.tpl | 0 .../{2.0.13 => 2.0.14}/templates/_service.tpl | 0 .../{2.0.13 => 2.0.14}/templates/common.yaml | 0 .../{2.0.13 => 2.0.14}/to_keep_versions.md | 0 30 files changed, 9 insertions(+), 5 deletions(-) rename charts/nextcloud/{2.0.13 => 2.0.14}/.helmignore (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/Chart.lock (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/Chart.yaml (97%) rename charts/nextcloud/{2.0.13 => 2.0.14}/README.md (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/app-readme.md (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/charts/common-1.2.9.tgz (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/ci/basic-values.yaml (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/ci/https-values.yaml (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/ci/no-cron.yaml (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/ci/nocmd-values.yaml (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/ci/onedata-values.yaml (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/ix_values.yaml (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/metadata.yaml (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/migrations/migrate (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/questions.yaml (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/NOTES.txt (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/_configuration.tpl (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/_cron.tpl (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/_migration.tpl (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/_nextcloud-configs.tpl (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/_nextcloud.tpl (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/_nginx-configuration.tpl (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/_nginx.tpl (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/_persistence.tpl (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/_portal.tpl (80%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/_postgres.tpl (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/_redis.tpl (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/_service.tpl (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/templates/common.yaml (100%) rename charts/nextcloud/{2.0.13 => 2.0.14}/to_keep_versions.md (100%) diff --git a/charts/nextcloud/2.0.13/.helmignore b/charts/nextcloud/2.0.14/.helmignore similarity index 100% rename from charts/nextcloud/2.0.13/.helmignore rename to charts/nextcloud/2.0.14/.helmignore diff --git a/charts/nextcloud/2.0.13/Chart.lock b/charts/nextcloud/2.0.14/Chart.lock similarity index 100% rename from charts/nextcloud/2.0.13/Chart.lock rename to charts/nextcloud/2.0.14/Chart.lock diff --git a/charts/nextcloud/2.0.13/Chart.yaml b/charts/nextcloud/2.0.14/Chart.yaml similarity index 97% rename from charts/nextcloud/2.0.13/Chart.yaml rename to charts/nextcloud/2.0.14/Chart.yaml index eb6a60baa5..48b1ccc854 100644 --- a/charts/nextcloud/2.0.13/Chart.yaml +++ b/charts/nextcloud/2.0.14/Chart.yaml @@ -4,7 +4,7 @@ description: A file sharing server that puts the control and security of your ow annotations: title: Nextcloud type: application -version: 2.0.13 +version: 2.0.14 apiVersion: v2 appVersion: 29.0.5 kubeVersion: '>=1.16.0-0' diff --git a/charts/nextcloud/2.0.13/README.md b/charts/nextcloud/2.0.14/README.md similarity index 100% rename from charts/nextcloud/2.0.13/README.md rename to charts/nextcloud/2.0.14/README.md diff --git a/charts/nextcloud/2.0.13/app-readme.md b/charts/nextcloud/2.0.14/app-readme.md similarity index 100% rename from charts/nextcloud/2.0.13/app-readme.md rename to charts/nextcloud/2.0.14/app-readme.md diff --git a/charts/nextcloud/2.0.13/charts/common-1.2.9.tgz b/charts/nextcloud/2.0.14/charts/common-1.2.9.tgz similarity index 100% rename from charts/nextcloud/2.0.13/charts/common-1.2.9.tgz rename to charts/nextcloud/2.0.14/charts/common-1.2.9.tgz diff --git a/charts/nextcloud/2.0.13/ci/basic-values.yaml b/charts/nextcloud/2.0.14/ci/basic-values.yaml similarity index 100% rename from charts/nextcloud/2.0.13/ci/basic-values.yaml rename to charts/nextcloud/2.0.14/ci/basic-values.yaml diff --git a/charts/nextcloud/2.0.13/ci/https-values.yaml b/charts/nextcloud/2.0.14/ci/https-values.yaml similarity index 100% rename from charts/nextcloud/2.0.13/ci/https-values.yaml rename to charts/nextcloud/2.0.14/ci/https-values.yaml diff --git a/charts/nextcloud/2.0.13/ci/no-cron.yaml b/charts/nextcloud/2.0.14/ci/no-cron.yaml similarity index 100% rename from charts/nextcloud/2.0.13/ci/no-cron.yaml rename to charts/nextcloud/2.0.14/ci/no-cron.yaml diff --git a/charts/nextcloud/2.0.13/ci/nocmd-values.yaml b/charts/nextcloud/2.0.14/ci/nocmd-values.yaml similarity index 100% rename from charts/nextcloud/2.0.13/ci/nocmd-values.yaml rename to charts/nextcloud/2.0.14/ci/nocmd-values.yaml diff --git a/charts/nextcloud/2.0.13/ci/onedata-values.yaml b/charts/nextcloud/2.0.14/ci/onedata-values.yaml similarity index 100% rename from charts/nextcloud/2.0.13/ci/onedata-values.yaml rename to charts/nextcloud/2.0.14/ci/onedata-values.yaml diff --git a/charts/nextcloud/2.0.13/ix_values.yaml b/charts/nextcloud/2.0.14/ix_values.yaml similarity index 100% rename from charts/nextcloud/2.0.13/ix_values.yaml rename to charts/nextcloud/2.0.14/ix_values.yaml diff --git a/charts/nextcloud/2.0.13/metadata.yaml b/charts/nextcloud/2.0.14/metadata.yaml similarity index 100% rename from charts/nextcloud/2.0.13/metadata.yaml rename to charts/nextcloud/2.0.14/metadata.yaml diff --git a/charts/nextcloud/2.0.13/migrations/migrate b/charts/nextcloud/2.0.14/migrations/migrate similarity index 100% rename from charts/nextcloud/2.0.13/migrations/migrate rename to charts/nextcloud/2.0.14/migrations/migrate diff --git a/charts/nextcloud/2.0.13/questions.yaml b/charts/nextcloud/2.0.14/questions.yaml similarity index 100% rename from charts/nextcloud/2.0.13/questions.yaml rename to charts/nextcloud/2.0.14/questions.yaml diff --git a/charts/nextcloud/2.0.13/templates/NOTES.txt b/charts/nextcloud/2.0.14/templates/NOTES.txt similarity index 100% rename from charts/nextcloud/2.0.13/templates/NOTES.txt rename to charts/nextcloud/2.0.14/templates/NOTES.txt diff --git a/charts/nextcloud/2.0.13/templates/_configuration.tpl b/charts/nextcloud/2.0.14/templates/_configuration.tpl similarity index 100% rename from charts/nextcloud/2.0.13/templates/_configuration.tpl rename to charts/nextcloud/2.0.14/templates/_configuration.tpl diff --git a/charts/nextcloud/2.0.13/templates/_cron.tpl b/charts/nextcloud/2.0.14/templates/_cron.tpl similarity index 100% rename from charts/nextcloud/2.0.13/templates/_cron.tpl rename to charts/nextcloud/2.0.14/templates/_cron.tpl diff --git a/charts/nextcloud/2.0.13/templates/_migration.tpl b/charts/nextcloud/2.0.14/templates/_migration.tpl similarity index 100% rename from charts/nextcloud/2.0.13/templates/_migration.tpl rename to charts/nextcloud/2.0.14/templates/_migration.tpl diff --git a/charts/nextcloud/2.0.13/templates/_nextcloud-configs.tpl b/charts/nextcloud/2.0.14/templates/_nextcloud-configs.tpl similarity index 100% rename from charts/nextcloud/2.0.13/templates/_nextcloud-configs.tpl rename to charts/nextcloud/2.0.14/templates/_nextcloud-configs.tpl diff --git a/charts/nextcloud/2.0.13/templates/_nextcloud.tpl b/charts/nextcloud/2.0.14/templates/_nextcloud.tpl similarity index 100% rename from charts/nextcloud/2.0.13/templates/_nextcloud.tpl rename to charts/nextcloud/2.0.14/templates/_nextcloud.tpl diff --git a/charts/nextcloud/2.0.13/templates/_nginx-configuration.tpl b/charts/nextcloud/2.0.14/templates/_nginx-configuration.tpl similarity index 100% rename from charts/nextcloud/2.0.13/templates/_nginx-configuration.tpl rename to charts/nextcloud/2.0.14/templates/_nginx-configuration.tpl diff --git a/charts/nextcloud/2.0.13/templates/_nginx.tpl b/charts/nextcloud/2.0.14/templates/_nginx.tpl similarity index 100% rename from charts/nextcloud/2.0.13/templates/_nginx.tpl rename to charts/nextcloud/2.0.14/templates/_nginx.tpl diff --git a/charts/nextcloud/2.0.13/templates/_persistence.tpl b/charts/nextcloud/2.0.14/templates/_persistence.tpl similarity index 100% rename from charts/nextcloud/2.0.13/templates/_persistence.tpl rename to charts/nextcloud/2.0.14/templates/_persistence.tpl diff --git a/charts/nextcloud/2.0.13/templates/_portal.tpl b/charts/nextcloud/2.0.14/templates/_portal.tpl similarity index 80% rename from charts/nextcloud/2.0.13/templates/_portal.tpl rename to charts/nextcloud/2.0.14/templates/_portal.tpl index 9d4ffbeaff..3fd7622681 100644 --- a/charts/nextcloud/2.0.13/templates/_portal.tpl +++ b/charts/nextcloud/2.0.14/templates/_portal.tpl @@ -3,14 +3,18 @@ {{- if .Values.ncNetwork.certificateID -}} {{- $protocol = "https" -}} {{- end -}} -{{- $host := "$node_ip" -}} -{{- if .Values.ncConfig.host -}} - {{- $host = .Values.ncConfig.host -}} -{{- end -}} {{- $port := .Values.ncNetwork.webPort -}} {{- if .Values.ncNetwork.nginx.useDifferentAccessPort -}} {{- $port = .Values.ncNetwork.nginx.externalAccessPort -}} {{- end }} +{{- $host := "$node_ip" -}} +{{- if .Values.ncConfig.host -}} + {{- $host = .Values.ncConfig.host -}} + {{- if contains ":" .Values.ncConfig.host -}} + {{- $host = (split ":" $host)._0 -}} + {{- $port = (split ":" $host)._1 -}} + {{- end -}} +{{- end -}} --- apiVersion: v1 kind: ConfigMap diff --git a/charts/nextcloud/2.0.13/templates/_postgres.tpl b/charts/nextcloud/2.0.14/templates/_postgres.tpl similarity index 100% rename from charts/nextcloud/2.0.13/templates/_postgres.tpl rename to charts/nextcloud/2.0.14/templates/_postgres.tpl diff --git a/charts/nextcloud/2.0.13/templates/_redis.tpl b/charts/nextcloud/2.0.14/templates/_redis.tpl similarity index 100% rename from charts/nextcloud/2.0.13/templates/_redis.tpl rename to charts/nextcloud/2.0.14/templates/_redis.tpl diff --git a/charts/nextcloud/2.0.13/templates/_service.tpl b/charts/nextcloud/2.0.14/templates/_service.tpl similarity index 100% rename from charts/nextcloud/2.0.13/templates/_service.tpl rename to charts/nextcloud/2.0.14/templates/_service.tpl diff --git a/charts/nextcloud/2.0.13/templates/common.yaml b/charts/nextcloud/2.0.14/templates/common.yaml similarity index 100% rename from charts/nextcloud/2.0.13/templates/common.yaml rename to charts/nextcloud/2.0.14/templates/common.yaml diff --git a/charts/nextcloud/2.0.13/to_keep_versions.md b/charts/nextcloud/2.0.14/to_keep_versions.md similarity index 100% rename from charts/nextcloud/2.0.13/to_keep_versions.md rename to charts/nextcloud/2.0.14/to_keep_versions.md