Add conditional support for annotation and optional existing keystore…

… secret reference
OSGP · Sep 17, 2024 · 19d4c2d · 19d4c2d
1 parent 0da38ed
commit 19d4c2d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/charts/gxf/templates/certificate-keystore-secret.yaml b/charts/gxf/templates/certificate-keystore-secret.yaml
@@ -1,9 +1,12 @@
+{{- if .Values.generateSecret -}}
 apiVersion: v1
-kind: Secret 
+kind: Secret
 metadata:
   name: {{ .Release.Name }}-keystore-password
   annotations:
+    {{- if .Values.sealedSecretsManaged }}
     sealedsecrets.bitnami.com/managed: "true"
+    {{- end }}
 type: Opaque
 data:
   keystore-password: {{ $secret := lookup "v1" "Secret" .Release.Namespace (printf "%s-keystore-password" .Release.Name) }}
@@ -12,3 +15,4 @@ data:
     {{- else -}}
       {{- randAlphaNum 32 | b64enc | quote -}}
     {{- end -}}
+{{- end }}
diff --git a/charts/gxf/templates/certificate.yaml b/charts/gxf/templates/certificate.yaml
@@ -33,7 +33,7 @@ spec:
     pkcs12:
       create: true
       passwordSecretRef:
-        name: {{ $.Release.Name }}-keystore-password
+        name: {{ $.Values.keystoreSecretName | default (printf "%s-keystore-password" $.Release.Name) }}
         key: keystore-password
 ---
 {{- end }}
diff --git a/charts/gxf/values.yaml b/charts/gxf/values.yaml
@@ -114,3 +114,6 @@ certificates: []
   #   commonName: example.com
   #   dnsNames:
   #     - example.com
+generateSecret: true # Set to true if you want to generate a new secret  
+sealedSecretsManaged: false # Set to false if the annotation should not be added 
+keystoreSecretName: ""