From 0bf059e8e1560a63d4b5efbd80a00a896539f86b Mon Sep 17 00:00:00 2001
From: Dominik Kaminski <kaminski@univention.de>
Date: Thu, 11 Jan 2024 16:06:35 +0100
Subject: [PATCH] fix(univention-management-stack): Add missing image template
 for ums stack gateway and imagePullSecrets to keycloak extensions

---
 .../values-ums-keycloak-extensions.yaml.gotmpl            | 2 ++
 .../values-ums-stack-gateway.gotmpl                       | 6 ++++++
 helmfile/environments/default/charts.yaml                 | 4 ++--
 helmfile/environments/default/images.yaml                 | 8 ++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/helmfile/apps/univention-management-stack/values-ums-keycloak-extensions.yaml.gotmpl b/helmfile/apps/univention-management-stack/values-ums-keycloak-extensions.yaml.gotmpl
index 80c34bcf..d7c88934 100644
--- a/helmfile/apps/univention-management-stack/values-ums-keycloak-extensions.yaml.gotmpl
+++ b/helmfile/apps/univention-management-stack/values-ums-keycloak-extensions.yaml.gotmpl
@@ -24,6 +24,7 @@ handler:
     repository: {{ .Values.images.umsKeycloakExtensionHandler.repository | quote }}
     tag: {{ .Values.images.umsKeycloakExtensionHandler.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+  imagePullSecrets: {{ .Values.global.imagePullSecrets }}
   appConfig:
     captchaProtectionEnable: false
     smtpPassword: {{ .Values.smtp.password | quote }}
@@ -52,6 +53,7 @@ proxy:
     repository: {{ .Values.images.umsKeycloakExtensionProxy.repository | quote }}
     tag: {{ .Values.images.umsKeycloakExtensionProxy.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+  imagePullSecrets: {{ .Values.global.imagePullSecrets }}
   ingress:
     annotations:
       nginx.org/proxy-buffer-size: "8k"
diff --git a/helmfile/apps/univention-management-stack/values-ums-stack-gateway.gotmpl b/helmfile/apps/univention-management-stack/values-ums-stack-gateway.gotmpl
index e245a9bf..c0ae03cc 100644
--- a/helmfile/apps/univention-management-stack/values-ums-stack-gateway.gotmpl
+++ b/helmfile/apps/univention-management-stack/values-ums-stack-gateway.gotmpl
@@ -2,6 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 ---
 
+image:
+  registry: {{ .Values.global.imageRegistry | default .Values.images.umsStackGateway.registry | quote }}
+  repository: {{ .Values.images.umsStackGateway.repository | quote }}
+  tag: {{ .Values.images.umsStackGateway.tag | quote }}
+  pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+
 ingress:
   enabled: {{ .Values.ingress.enabled }}
   hostname: {{ printf "%s.%s" .Values.global.hosts.univentionManagementStack .Values.global.domain | quote }}
diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml
index fa00cdc6..0b053062 100644
--- a/helmfile/environments/default/charts.yaml
+++ b/helmfile/environments/default/charts.yaml
@@ -510,7 +510,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
     name: "keycloak-extensions"
-    version: "0.0.5"
+    version: "0.0.5-post-feat-add-imagepullsecrets"
     verify: true
     # @supplier: "Univention"
     # @mirrorFilter: '^(\d+)\.(\d+)\.(\d+)$'
@@ -734,7 +734,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/xwiki/charts-mirror"
     name: "xwiki"
-    version: "1.2.5"
+    version: "1.2.6"
     verify: false
     # @supplier: "XWiki"
     # @mirrorFilter: '^(\d+)\.(\d+)\.(\d+)$'
diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml
index 6807a855..353f4e28 100644
--- a/helmfile/environments/default/images.yaml
+++ b/helmfile/environments/default/images.yaml
@@ -720,6 +720,14 @@ images:
     # @supplier: "Univention"
     # @mirrorFilter: '^(\d+)\.(\d+)\.(\d+)$'
     # @mirrorFrom: ['0', '3', '2']
+  umsStackGateway:
+    # renovate:
+    # upstreamRegistry=docker.io
+    # upstreamRepository=bitnami/nginx
+    # dependencyType=external
+    registry: "docker.io"
+    repository: "bitnami/nginx"
+    tag: "1.25.3@sha256:40ce0d6b8f5fc174a4df8c59c8893164c540192ee862cb7253650a30d9dc3b73"
   umsStoreDav:
     # renovate:
     # upstreamRegistry=registry.souvap-univention.de