From e89b16a747f95be7661b1fd4f5c90acce638542e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= <thorsten.rossner.extern@zendis.de>
Date: Wed, 12 Jun 2024 12:39:23 +0200
Subject: [PATCH] fix(helmfile): Streamline `functional.yaml`. *Upgrade
 notice:* If you set a non default value for
 `.Values.portal.enableDeploymentInformation` please change it to
 `.Values.admin.portal.deploymentInformation.enabled` with this version.

---
 .../values-umbrella.yaml.gotmpl                       |  2 +-
 helmfile/environments/default/functional.yaml         | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/helmfile/apps/univention-management-stack/values-umbrella.yaml.gotmpl b/helmfile/apps/univention-management-stack/values-umbrella.yaml.gotmpl
index ee99d611..2becc541 100644
--- a/helmfile/apps/univention-management-stack/values-umbrella.yaml.gotmpl
+++ b/helmfile/apps/univention-management-stack/values-umbrella.yaml.gotmpl
@@ -674,7 +674,7 @@ stack-data-swp:
 
   stackDataSwp:
     udmApiPassword: {{ .Values.secrets.univentionManagementStack.ldapSecret | quote }}
-    {{- if .Values.portal.enableDeploymentInformation }}
+    {{- if .Values.admin.portal.deploymentInformation.enabled }}
     systemInformation:
       deployDate: "Deployed: {{ now | date "2006-01-02T15:04:05-0700" }}"
       releaseVersion: "Release: {{ .Values.global.systemInformation.releaseVersion }}"
diff --git a/helmfile/environments/default/functional.yaml b/helmfile/environments/default/functional.yaml
index d15e68c3..1b90dcd0 100644
--- a/helmfile/environments/default/functional.yaml
+++ b/helmfile/environments/default/functional.yaml
@@ -11,13 +11,16 @@ authentication:
 externalServices:
   nubus:
     udmRestApi:
-      # Set to 'true' if you don't want to make the UDM REST API from the Nubus stack externally available
+      # Enable to make the UDM REST API from the Nubus stack externally available.
       enabled: false
   matrix:
     federation:
+      # Disable to not support Matrix federation with your installation.
       enabled: true
 
-portal:
-  # Display deployment release and date in portal for admins.
-  enableDeploymentInformation: true
+admin:
+  portal:
+    deploymentInformation:
+      # Disable to not provide and update openDesk release version and deployment timestamp for admins in the portal.
+      enabled: true
 ...