From 1e62a0dfe14ccd840e910d6aea79fb7beabb8da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= Date: Mon, 24 Mar 2025 16:19:35 +0100 Subject: [PATCH] fix(nubus): Always use S3 gateway for assets --- helmfile/apps/nubus/helmfile-child.yaml.gotmpl | 4 ++-- helmfile/apps/nubus/values-nubus.yaml.gotmpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helmfile/apps/nubus/helmfile-child.yaml.gotmpl b/helmfile/apps/nubus/helmfile-child.yaml.gotmpl index 58fb46d8..7cf92bed 100644 --- a/helmfile/apps/nubus/helmfile-child.yaml.gotmpl +++ b/helmfile/apps/nubus/helmfile-child.yaml.gotmpl @@ -74,7 +74,7 @@ releases: installed: {{ .Values.apps.nubus.enabled }} timeout: 900 - # NGINX S3 Gateway (when cluster minio is not used) + # NGINX S3 Gateway - name: "nubus" chart: "nginx-s3-gateway-repo/{{ .Values.charts.nginxS3Gateway.name }}" version: "{{ .Values.charts.nginxS3Gateway.version }}" @@ -83,7 +83,7 @@ releases: {{- range .Values.customization.release.nginxS3Gateway }} - {{ . }} {{- end }} - installed: {{ not .Values.apps.minio.enabled }} + installed: {{ .Values.apps.nubus.enabled }} timeout: 900 commonLabels: diff --git a/helmfile/apps/nubus/values-nubus.yaml.gotmpl b/helmfile/apps/nubus/values-nubus.yaml.gotmpl index 752e5609..4557a451 100644 --- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl +++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl @@ -580,7 +580,7 @@ nubusPortalConsumer: {{- range .Values.global.imagePullSecrets }} - name: {{ . | quote }} {{- end }} - assetsBaseUrl: {{ printf "https://%s/%s/%s" (.Values.objectstores.nubus.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain)) (.Values.objectstores.nubus.bucket) "portal-assets" | quote }} + assetsBaseUrl: {{ printf "https://%s.%s/univention/portal" .Values.global.hosts.nubus .Values.global.domain | quote }} logLevel: {{ if .Values.debug.enabled }}"DEBUG"{{ else }}"INFO"{{ end }} objectStorage: auth: