From cbe8fb2d65e6ce73f9da95ef9b0ed3ffbb16d367 Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Thu, 23 Nov 2023 22:19:24 +0100 Subject: [PATCH] fix(univention-management-stack): Configure openDesk branding in frontend chart --- .../values-portal-frontend.gotmpl | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/helmfile/apps/univention-management-stack/values-portal-frontend.gotmpl b/helmfile/apps/univention-management-stack/values-portal-frontend.gotmpl index 949dec03..81f18a4f 100644 --- a/helmfile/apps/univention-management-stack/values-portal-frontend.gotmpl +++ b/helmfile/apps/univention-management-stack/values-portal-frontend.gotmpl @@ -25,6 +25,61 @@ extraIngresses: enabled: {{ .Values.ingress.tls.enabled }} secretName: {{ .Values.ingress.tls.secretName | quote }} + # See "extraVolumeMounts" below + custom-favicon: + enabled: true + annotations: + nginx.org/mergeable-ingress-type: "minion" + paths: + - pathType: Exact + path: /favicon.ico + tls: {} + + # See "extraVolumeMounts" below + custom-branding: + enabled: true + annotations: + nginx.ingress.kubernetes.io/configuration-snippet: | + rewrite ^/univention/portal(/.*)$ $1 break; + nginx.org/location-snippets: | + rewrite ^/univention/portal(/.*)$ $1 break; + nginx.org/mergeable-ingress-type: "minion" + paths: + # This relies on the correct implementation of the matching for paths of + # type "Prefix" since "/univention/portal/icons/entries/" is owned by + # store-dav. + # See: https://kubernetes.io/docs/concepts/services-networking/ingress/#multiple-matches + - pathType: Prefix + path: /univention/portal/icons/ + - pathType: Prefix + path: /univention/portal/custom/ + tls: {} + +extraVolumes: + - name: "opendesk-branding" + configMap: + name: "ums-stack-data-swp-branding" + +extraVolumeMounts: + - name: "opendesk-branding" + mountPath: "/var/www/html/favicon.ico" + subPath: "favicon.ico" + - name: "opendesk-branding" + mountPath: "/var/www/html/css/custom.css" + subPath: "custom.css" + - name: "opendesk-branding" + mountPath: "/var/www/html/icons/logo.svg" + subPath: "logo.svg" + - name: "opendesk-branding" + mountPath: "/var/www/html/icons/logo_small_border.svg" + subPath: "logo_small_border.svg" + - name: "opendesk-branding" + mountPath: "/var/www/html/custom/portal_background_image.png" + subPath: "portal_background_image.png" + - name: "opendesk-branding" + mountPath: "/var/www/html/custom/portal_background_image.svg" + subPath: "portal_background_image.svg" + resources: {{ .Values.resources.umsPortalFrontend | toYaml | nindent 2 }} ...