From 68cf6df27b2848f44df0da45b986c49e43efbff1 Mon Sep 17 00:00:00 2001
From: Angelo Sleebos <angelo.sleebos@alliander.com>
Date: Tue, 13 Aug 2024 10:59:47 +0200
Subject: [PATCH] add .Release.Name

Signed-off-by: Angelo Sleebos <angelo.sleebos@alliander.com>
---
 charts/gxf/templates/certificate-keystore-secret.yaml | 4 ++--
 charts/gxf/templates/certificate.yaml                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/gxf/templates/certificate-keystore-secret.yaml b/charts/gxf/templates/certificate-keystore-secret.yaml
index 3f28814..1e1cc47 100644
--- a/charts/gxf/templates/certificate-keystore-secret.yaml
+++ b/charts/gxf/templates/certificate-keystore-secret.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: keystore-password
+  name: {{ .Release.Name }}-keystore-password
 type: Opaque
 data:
-  keystore-password: {{ $secret := (lookup "v1" "Secret" .Release.Namespace "keystore-password") }}
+  keystore-password: {{ $secret := lookup "v1" "Secret" .Release.Namespace (printf "%s-keystore-password" .Release.Name) }}
     {{- if $secret -}}
       {{- index $secret "data" "keystore-password" -}}
     {{- else -}}
diff --git a/charts/gxf/templates/certificate.yaml b/charts/gxf/templates/certificate.yaml
index 6d412bb..e47c565 100644
--- a/charts/gxf/templates/certificate.yaml
+++ b/charts/gxf/templates/certificate.yaml
@@ -33,7 +33,7 @@ spec:
     pkcs12:
       create: true
       passwordSecretRef:
-        name: keystore-password
+        name: {{ $.Release.Name }}-keystore-password
         key: password
 ---
 {{- end }}