From 2d52fac18c04a27f5422178f4020a2609cf8a365 Mon Sep 17 00:00:00 2001
From: Andreas Niemann <a.niemann@olsitec.de>
Date: Wed, 3 Jul 2024 10:44:44 +0200
Subject: [PATCH] chore(nubus): Change stack-gateway ingress hostname to read
 .Values.global.domain

---
 helmfile/apps/nubus/values-nubus.yaml.gotmpl | 8 +++++++-
 helmfile/environments/default/charts.yaml    | 9 ++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/helmfile/apps/nubus/values-nubus.yaml.gotmpl b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
index b7e792d9..b8c473bf 100644
--- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
@@ -21,7 +21,7 @@ global:
 
 nubusStackGateway:
   ingress:
-    hostname: "portal.{{ .Values.global.domain }}"
+    hostname: "portal.{{ .Release.Namespace }}.{{ .Values.global.domain }}"
     ingressClassName: {{ .Values.ingress.ingressClassName | default "nginx" | quote }}
 
 # Nubus bundled services
@@ -158,6 +158,9 @@ nubusUmcServer:
       credentialSecret:
         name: "ums-umc-server-memcached-opendesk-credentials"
         key: "umcServerMemcachedPassword"
+  smtp:
+    credentialSecret:
+      name: "ums-umc-server-smtp-credentials"
 
 nubusKeycloakBootstrap:
   bootstrap:
@@ -196,3 +199,6 @@ extraSecrets:
     stringData:
       access-key-id: {{ .Values.objectstores.univentionManagementStack.username | quote }}
       secret-key-id: {{ .Values.objectstores.univentionManagementStack.secretKey | default .Values.secrets.minio.umsUser | quote }}
+  - name: "ums-umc-server-smtp-credentials"
+    stringData:
+      password: {{ .Values.smtp.password | quote }}
diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml
index ac275738..ebea6df9 100644
--- a/helmfile/environments/default/charts.yaml
+++ b/helmfile/environments/default/charts.yaml
@@ -249,10 +249,13 @@ charts:
     # upstreamRepository: "nubus/charts/nubus"
     # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
     # upstreamMirrorStartFrom: ["0", "19", "3"]
-    registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
+    # registry: "registry.opencode.de"
+    # repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
+    # # upstreamMirrorStartFrom: ["0", "12", "0"]
+    registry: "artifacts.software-univention.de"
+    repository: "nubus-dev/charts"
     name: "nubus"
-    version: "0.19.3"
+    version: "0.20.0-pre-feat-drop-stack-gateway"
     verify: true
   opendeskKeycloakBootstrap:
     # providerCategory: "Platform"