From 1c9844e32ab1b120f5a194866e204a970c3fe8ca Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 29 Feb 2024 13:23:59 +0100
Subject: [PATCH] OZG-4939
---
src/main/helm/templates/_helpers.tpl | 4 ++++
src/main/helm/templates/keycloak-client-crd.yaml | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 46af0a15..20467d77 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -3,6 +3,10 @@
{{- printf "%s-%s.%s" (.Values.ozgcloud).bezeichner (.Values.ozgcloud).adminDomainSuffix .Values.baseUrl }}
{{- end -}}
+{{/* Namespace */}}
+{{- define "app.namespace" -}}
+{{- default .Release.Namespace | toString | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
{{/* Default Labels: Helm recommended best-practice labels https://helm.sh/docs/chart_best_practices/labels/ */}}
{{- define "app.defaultLabels" }}
diff --git a/src/main/helm/templates/keycloak-client-crd.yaml b/src/main/helm/templates/keycloak-client-crd.yaml
index 50f908ff..aeb4ddf9 100644
--- a/src/main/helm/templates/keycloak-client-crd.yaml
+++ b/src/main/helm/templates/keycloak-client-crd.yaml
@@ -5,7 +5,7 @@ apiVersion: operator.ozgcloud.de/v1
kind: OzgCloudKeycloakClient
metadata:
name: administration-keycloak-client
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "app.namespace" $ }}
spec:
keep_after_delete: {{ (.Values.sso).keep_after_delete | default false }}
client_name: {{ $client.client_name }}
--
GitLab