From c19bca2be0d14750bbef661e45c5c424f7da8e77 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes.bornhold.extern@univention.de>
Date: Thu, 23 Nov 2023 22:30:15 +0100
Subject: [PATCH] fix(univention-management-stack): Use "stack-gateway" in all
 deployments

---
 .../apps/univention-management-stack/helmfile.yaml   |  4 ----
 .../univention-management-stack/values-common.gotmpl |  6 +++++-
 .../values-portal-frontend.gotmpl                    | 12 ++++++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/helmfile/apps/univention-management-stack/helmfile.yaml b/helmfile/apps/univention-management-stack/helmfile.yaml
index df415bdb..fb467769 100644
--- a/helmfile/apps/univention-management-stack/helmfile.yaml
+++ b/helmfile/apps/univention-management-stack/helmfile.yaml
@@ -22,9 +22,6 @@ repositories:
     keyring: "../../files/gpg-pubkeys/souvap-univention-de.gpg"
 
 releases:
-  # TODO: Interim, until the UMS stack has a stack umbrella chart and provides a solution
-  # {{- if eq .Values.ingress.ingressClassName "dedicated-haproxy-external" }}
-
   # renovate:
   # registryUrl=https://registry.souvap-univention.de
   # packageName=souvap/tooling/charts/bitnami-charts/nginx
@@ -36,7 +33,6 @@ releases:
     values:
       - "values-ums-stack-gateway.gotmpl"
     installed: {{ .Values.univentionManagementStack.enabled }}
-  # {{- end }}
 
   # renovate:
   # registryUrl=https://gitlab.souvap-univention.de/api/v4/projects/155/packages/helm/stable
diff --git a/helmfile/apps/univention-management-stack/values-common.gotmpl b/helmfile/apps/univention-management-stack/values-common.gotmpl
index 3fba9b30..f6abadf8 100644
--- a/helmfile/apps/univention-management-stack/values-common.gotmpl
+++ b/helmfile/apps/univention-management-stack/values-common.gotmpl
@@ -4,7 +4,11 @@ SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 ingress:
-  enabled: {{ if eq .Values.ingress.ingressClassName "dedicated-haproxy-external" }}false{{ else }}{{ .Values.ingress.enabled }}{{ end }}
+  # Intentionally not using the Ingress configuration of the UMS stack at the
+  # moment, since it does depend on rewriting capabilities of the ingress
+  # controller. Those are encapsulated into the release "stack-gateway" so that
+  # the compatibility with all ingress controllers is increased.
+  enabled: false
   host: "{{ .Values.global.hosts.univentionManagementStack }}.{{ .Values.global.domain }}"
   ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
   tls:
diff --git a/helmfile/apps/univention-management-stack/values-portal-frontend.gotmpl b/helmfile/apps/univention-management-stack/values-portal-frontend.gotmpl
index 81f18a4f..79780505 100644
--- a/helmfile/apps/univention-management-stack/values-portal-frontend.gotmpl
+++ b/helmfile/apps/univention-management-stack/values-portal-frontend.gotmpl
@@ -15,19 +15,22 @@ image:
 
 extraIngresses:
   redirects:
-    enabled: {{ if eq .Values.ingress.ingressClassName "dedicated-haproxy-external" }}false{{ else }}{{ .Values.ingress.enabled }}{{ end }}
+    # Using "stack-gateway" currently.
+    enabled: false
     # The TLS configuration is on the "master" Ingress, see below.
     tls:
       enabled: false
   master:
-    enabled: {{ if eq .Values.ingress.ingressClassName "dedicated-haproxy-external" }}false{{ else }}{{ .Values.ingress.enabled }}{{ end }}
+    # Using "stack-gateway" currently.
+    enabled: false
     tls:
       enabled: {{ .Values.ingress.tls.enabled }}
       secretName: {{ .Values.ingress.tls.secretName | quote }}
 
   # See "extraVolumeMounts" below
   custom-favicon:
-    enabled: true
+    # Using "stack-gateway" at the moment
+    enabled: false
     annotations:
       nginx.org/mergeable-ingress-type: "minion"
     paths:
@@ -37,7 +40,8 @@ extraIngresses:
 
   # See "extraVolumeMounts" below
   custom-branding:
-    enabled: true
+    # Using "stack-gateway" at the moment
+    enabled: false
     annotations:
       nginx.ingress.kubernetes.io/configuration-snippet: |
         rewrite ^/univention/portal(/.*)$ $1 break;