From 9fdab912f04066a54c683a19512355694d3acd17 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Wed, 30 Aug 2023 11:58:49 +0000 Subject: [PATCH] Publish new changes in catalog --- .../nextcloud/{1.6.42 => 1.6.43}/.helmignore | 0 charts/nextcloud/{1.6.42 => 1.6.43}/Chart.lock | 0 charts/nextcloud/{1.6.42 => 1.6.43}/Chart.yaml | 2 +- charts/nextcloud/{1.6.42 => 1.6.43}/README.md | 0 .../nextcloud/{1.6.42 => 1.6.43}/app-readme.md | 0 .../charts/common-2304.0.1.tgz | Bin .../{1.6.42 => 1.6.43}/ci/test-values.yaml | 2 ++ .../{1.6.42 => 1.6.43}/ix_values.yaml | 0 .../nextcloud/{1.6.42 => 1.6.43}/metadata.yaml | 0 .../migrations/migrate_from_1.1.0 | 0 .../{1.6.42 => 1.6.43}/questions.yaml | 17 +++++++++++++++++ .../{1.6.42 => 1.6.43}/templates/NOTES.txt | 0 .../{1.6.42 => 1.6.43}/templates/_nginx.tpl | 0 .../{1.6.42 => 1.6.43}/templates/_postgres.tpl | 0 .../templates/backup-postgres-config.yaml | 0 .../templates/backup-postgres-hook.yaml | 0 .../{1.6.42 => 1.6.43}/templates/cronjob.yaml | 0 .../templates/deployment.yaml | 8 ++++++-- .../templates/nextcloud-configmap.yaml | 0 .../templates/nginx-configmap.yaml | 17 +++++++++++++++++ .../templates/nginx-secret.yaml | 0 .../templates/nuke-deployments-hook.yaml | 0 .../templates/postgres-deployment.yaml | 0 .../templates/postgres-secret.yaml | 0 .../templates/postgres-service.yaml | 0 .../{1.6.42 => 1.6.43}/templates/secrets.yaml | 0 .../{1.6.42 => 1.6.43}/templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 28 files changed, 43 insertions(+), 3 deletions(-) rename charts/nextcloud/{1.6.42 => 1.6.43}/.helmignore (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/Chart.lock (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/Chart.yaml (98%) rename charts/nextcloud/{1.6.42 => 1.6.43}/README.md (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/app-readme.md (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/charts/common-2304.0.1.tgz (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/ci/test-values.yaml (94%) rename charts/nextcloud/{1.6.42 => 1.6.43}/ix_values.yaml (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/metadata.yaml (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/migrations/migrate_from_1.1.0 (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/questions.yaml (95%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/NOTES.txt (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/_nginx.tpl (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/_postgres.tpl (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/backup-postgres-config.yaml (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/backup-postgres-hook.yaml (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/cronjob.yaml (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/deployment.yaml (97%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/nextcloud-configmap.yaml (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/nginx-configmap.yaml (75%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/nginx-secret.yaml (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/nuke-deployments-hook.yaml (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/postgres-deployment.yaml (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/postgres-secret.yaml (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/postgres-service.yaml (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/secrets.yaml (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/service.yaml (100%) rename charts/nextcloud/{1.6.42 => 1.6.43}/templates/serviceaccount.yaml (100%) diff --git a/charts/nextcloud/1.6.42/.helmignore b/charts/nextcloud/1.6.43/.helmignore similarity index 100% rename from charts/nextcloud/1.6.42/.helmignore rename to charts/nextcloud/1.6.43/.helmignore diff --git a/charts/nextcloud/1.6.42/Chart.lock b/charts/nextcloud/1.6.43/Chart.lock similarity index 100% rename from charts/nextcloud/1.6.42/Chart.lock rename to charts/nextcloud/1.6.43/Chart.lock diff --git a/charts/nextcloud/1.6.42/Chart.yaml b/charts/nextcloud/1.6.43/Chart.yaml similarity index 98% rename from charts/nextcloud/1.6.42/Chart.yaml rename to charts/nextcloud/1.6.43/Chart.yaml index 97425702ff..878aac4e9c 100644 --- a/charts/nextcloud/1.6.42/Chart.yaml +++ b/charts/nextcloud/1.6.43/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: 1.6.42 +version: 1.6.43 apiVersion: v2 appVersion: 27.0.2 kubeVersion: '>=1.16.0-0' diff --git a/charts/nextcloud/1.6.42/README.md b/charts/nextcloud/1.6.43/README.md similarity index 100% rename from charts/nextcloud/1.6.42/README.md rename to charts/nextcloud/1.6.43/README.md diff --git a/charts/nextcloud/1.6.42/app-readme.md b/charts/nextcloud/1.6.43/app-readme.md similarity index 100% rename from charts/nextcloud/1.6.42/app-readme.md rename to charts/nextcloud/1.6.43/app-readme.md diff --git a/charts/nextcloud/1.6.42/charts/common-2304.0.1.tgz b/charts/nextcloud/1.6.43/charts/common-2304.0.1.tgz similarity index 100% rename from charts/nextcloud/1.6.42/charts/common-2304.0.1.tgz rename to charts/nextcloud/1.6.43/charts/common-2304.0.1.tgz diff --git a/charts/nextcloud/1.6.42/ci/test-values.yaml b/charts/nextcloud/1.6.43/ci/test-values.yaml similarity index 94% rename from charts/nextcloud/1.6.42/ci/test-values.yaml rename to charts/nextcloud/1.6.43/ci/test-values.yaml index ad7d265e2e..1cc2f27351 100644 --- a/charts/nextcloud/1.6.42/ci/test-values.yaml +++ b/charts/nextcloud/1.6.43/ci/test-values.yaml @@ -12,6 +12,8 @@ environmentVariables: [] ixChartContext: {} nginxConfig: proxy_timeouts: 120 + useDifferentAccessPort: true + externalPort: 443 nextcloud: datadir: /var/www/html/data host: nextcloud.kube.home diff --git a/charts/nextcloud/1.6.42/ix_values.yaml b/charts/nextcloud/1.6.43/ix_values.yaml similarity index 100% rename from charts/nextcloud/1.6.42/ix_values.yaml rename to charts/nextcloud/1.6.43/ix_values.yaml diff --git a/charts/nextcloud/1.6.42/metadata.yaml b/charts/nextcloud/1.6.43/metadata.yaml similarity index 100% rename from charts/nextcloud/1.6.42/metadata.yaml rename to charts/nextcloud/1.6.43/metadata.yaml diff --git a/charts/nextcloud/1.6.42/migrations/migrate_from_1.1.0 b/charts/nextcloud/1.6.43/migrations/migrate_from_1.1.0 similarity index 100% rename from charts/nextcloud/1.6.42/migrations/migrate_from_1.1.0 rename to charts/nextcloud/1.6.43/migrations/migrate_from_1.1.0 diff --git a/charts/nextcloud/1.6.42/questions.yaml b/charts/nextcloud/1.6.43/questions.yaml similarity index 95% rename from charts/nextcloud/1.6.42/questions.yaml rename to charts/nextcloud/1.6.43/questions.yaml index 45818d65f6..20f9e1bdd2 100644 --- a/charts/nextcloud/1.6.42/questions.yaml +++ b/charts/nextcloud/1.6.43/questions.yaml @@ -86,6 +86,23 @@ questions: min: 30 default: 60 required: true + - variable: useDifferentAccessPort + label: "Use different port for URL rewrites" + description: | + If enabled, the URL rewrite will use [Access Port] defined below instead of the [Node Port].
+ Note that Nextcloud will still listen on the [Node Port]. (Default 9001) + schema: + type: boolean + default: false + - variable: externalAccessPort + label: "External Access Port" + schema: + type: int + show_if: [["useDifferentAccessPort", "=", true]] + min: 443 + max: 65535 + default: 443 + required: true - variable: nextcloud description: "Nextcloud configuration details" diff --git a/charts/nextcloud/1.6.42/templates/NOTES.txt b/charts/nextcloud/1.6.43/templates/NOTES.txt similarity index 100% rename from charts/nextcloud/1.6.42/templates/NOTES.txt rename to charts/nextcloud/1.6.43/templates/NOTES.txt diff --git a/charts/nextcloud/1.6.42/templates/_nginx.tpl b/charts/nextcloud/1.6.43/templates/_nginx.tpl similarity index 100% rename from charts/nextcloud/1.6.42/templates/_nginx.tpl rename to charts/nextcloud/1.6.43/templates/_nginx.tpl diff --git a/charts/nextcloud/1.6.42/templates/_postgres.tpl b/charts/nextcloud/1.6.43/templates/_postgres.tpl similarity index 100% rename from charts/nextcloud/1.6.42/templates/_postgres.tpl rename to charts/nextcloud/1.6.43/templates/_postgres.tpl diff --git a/charts/nextcloud/1.6.42/templates/backup-postgres-config.yaml b/charts/nextcloud/1.6.43/templates/backup-postgres-config.yaml similarity index 100% rename from charts/nextcloud/1.6.42/templates/backup-postgres-config.yaml rename to charts/nextcloud/1.6.43/templates/backup-postgres-config.yaml diff --git a/charts/nextcloud/1.6.42/templates/backup-postgres-hook.yaml b/charts/nextcloud/1.6.43/templates/backup-postgres-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.42/templates/backup-postgres-hook.yaml rename to charts/nextcloud/1.6.43/templates/backup-postgres-hook.yaml diff --git a/charts/nextcloud/1.6.42/templates/cronjob.yaml b/charts/nextcloud/1.6.43/templates/cronjob.yaml similarity index 100% rename from charts/nextcloud/1.6.42/templates/cronjob.yaml rename to charts/nextcloud/1.6.43/templates/cronjob.yaml diff --git a/charts/nextcloud/1.6.42/templates/deployment.yaml b/charts/nextcloud/1.6.43/templates/deployment.yaml similarity index 97% rename from charts/nextcloud/1.6.42/templates/deployment.yaml rename to charts/nextcloud/1.6.43/templates/deployment.yaml index cac2e3a6d1..7cae2ea2c6 100644 --- a/charts/nextcloud/1.6.42/templates/deployment.yaml +++ b/charts/nextcloud/1.6.43/templates/deployment.yaml @@ -83,7 +83,11 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} {{ if eq (include "nginx.certAvailable" .) "true" }} {{ $envList = mustAppend $envList (dict "name" "APACHE_DISABLE_REWRITE_IP" "value" "1") }} {{ if and .Values.nextcloud.host .Values.service.nodePort }} + {{ if .Values.nginxConfig.use443 }} + {{ $envList = mustAppend $envList (dict "name" "OVERWRITEHOST" "value" .Values.nextcloud.host) }} + {{ else }} {{ $envList = mustAppend $envList (dict "name" "OVERWRITEHOST" "value" (printf "%v:%v" .Values.nextcloud.host .Values.service.nodePort)) }} + {{ end }} {{ end }} {{ $envList = mustAppend $envList (dict "name" "OVERWRITEPROTOCOL" "value" "https") }} {{ $envList = mustAppend $envList (dict "name" "TRUSTED_PROXIES" "value" "127.0.0.1") }} @@ -154,9 +158,9 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} value: localhost {{ end }} initialDelaySeconds: 60 - periodSeconds: 5 + periodSeconds: 10 timeoutSeconds: 2 - failureThreshold: 120 + failureThreshold: 100 successThreshold: 1 volumeMounts: - name: nextcloud-data diff --git a/charts/nextcloud/1.6.42/templates/nextcloud-configmap.yaml b/charts/nextcloud/1.6.43/templates/nextcloud-configmap.yaml similarity index 100% rename from charts/nextcloud/1.6.42/templates/nextcloud-configmap.yaml rename to charts/nextcloud/1.6.43/templates/nextcloud-configmap.yaml diff --git a/charts/nextcloud/1.6.42/templates/nginx-configmap.yaml b/charts/nextcloud/1.6.43/templates/nginx-configmap.yaml similarity index 75% rename from charts/nextcloud/1.6.42/templates/nginx-configmap.yaml rename to charts/nextcloud/1.6.43/templates/nginx-configmap.yaml index f33e4e24d0..6e77b8eb51 100644 --- a/charts/nextcloud/1.6.42/templates/nginx-configmap.yaml +++ b/charts/nextcloud/1.6.43/templates/nginx-configmap.yaml @@ -6,6 +6,11 @@ data: protocol: {{ include "nginx.scheme" . }} {{ $timeout := 60 }} {{ $size := .Values.nextcloud.max_upload_size | default 3 }} + {{ $externalAccessPort := printf ":%v" .Values.nginxConfig.externalAccessPort }} + {{/* If its 443, do not append it on the rewrite at all */}} + {{ if eq $externalAccessPort ":443" }} + {{ $externalAccessPort = "" }} + {{ end }} {{/* Safely access key as it is conditionaly shown */}} {{ if hasKey .Values "nginxConfig" }} {{ $timeout = .Values.nginxConfig.proxy_timeouts | default 60 }} @@ -41,11 +46,19 @@ data: } location = /.well-known/carddav { + {{ if .Values.nginxConfig.useDifferentAccessPort }} + return 301 $scheme://$host{{ $externalAccessPort }}/remote.php/dav; + {{ else }} return 301 $scheme://$host:$server_port/remote.php/dav; + {{ end }} } location = /.well-known/caldav { + {{ if .Values.nginxConfig.useDifferentAccessPort }} + return 301 $scheme://$host{{ $externalAccessPort }}/remote.php/dav; + {{ else }} return 301 $scheme://$host:$server_port/remote.php/dav; + {{ end }} } location / { @@ -62,7 +75,11 @@ data: proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto https; proxy_set_header X-Forwarded-Host $host; + {{ if .Values.nginxConfig.useDifferentAccessPort }} + proxy_set_header X-Forwarded-Port {{ .Values.nginxConfig.externalAccessPort }}; + {{ else }} proxy_set_header X-Forwarded-Port $server_port; + {{ end }} # Proxy timeouts proxy_connect_timeout {{ $timeout }}s; diff --git a/charts/nextcloud/1.6.42/templates/nginx-secret.yaml b/charts/nextcloud/1.6.43/templates/nginx-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.42/templates/nginx-secret.yaml rename to charts/nextcloud/1.6.43/templates/nginx-secret.yaml diff --git a/charts/nextcloud/1.6.42/templates/nuke-deployments-hook.yaml b/charts/nextcloud/1.6.43/templates/nuke-deployments-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.42/templates/nuke-deployments-hook.yaml rename to charts/nextcloud/1.6.43/templates/nuke-deployments-hook.yaml diff --git a/charts/nextcloud/1.6.42/templates/postgres-deployment.yaml b/charts/nextcloud/1.6.43/templates/postgres-deployment.yaml similarity index 100% rename from charts/nextcloud/1.6.42/templates/postgres-deployment.yaml rename to charts/nextcloud/1.6.43/templates/postgres-deployment.yaml diff --git a/charts/nextcloud/1.6.42/templates/postgres-secret.yaml b/charts/nextcloud/1.6.43/templates/postgres-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.42/templates/postgres-secret.yaml rename to charts/nextcloud/1.6.43/templates/postgres-secret.yaml diff --git a/charts/nextcloud/1.6.42/templates/postgres-service.yaml b/charts/nextcloud/1.6.43/templates/postgres-service.yaml similarity index 100% rename from charts/nextcloud/1.6.42/templates/postgres-service.yaml rename to charts/nextcloud/1.6.43/templates/postgres-service.yaml diff --git a/charts/nextcloud/1.6.42/templates/secrets.yaml b/charts/nextcloud/1.6.43/templates/secrets.yaml similarity index 100% rename from charts/nextcloud/1.6.42/templates/secrets.yaml rename to charts/nextcloud/1.6.43/templates/secrets.yaml diff --git a/charts/nextcloud/1.6.42/templates/service.yaml b/charts/nextcloud/1.6.43/templates/service.yaml similarity index 100% rename from charts/nextcloud/1.6.42/templates/service.yaml rename to charts/nextcloud/1.6.43/templates/service.yaml diff --git a/charts/nextcloud/1.6.42/templates/serviceaccount.yaml b/charts/nextcloud/1.6.43/templates/serviceaccount.yaml similarity index 100% rename from charts/nextcloud/1.6.42/templates/serviceaccount.yaml rename to charts/nextcloud/1.6.43/templates/serviceaccount.yaml