From 7eac63fcf22203011b8e14754a39e3a513a2dbeb Mon Sep 17 00:00:00 2001
From: stremovsky <stremovsky@gmail.com>
Date: Thu, 23 Dec 2021 18:57:00 +0200
Subject: [PATCH] support for certificates stored in external secrets

---
 charts/databunker/templates/_certificates.tpl | 4 ++--
 charts/databunker/templates/deployment.yaml   | 2 +-
 charts/databunker/templates/secrets.yaml      | 2 +-
 charts/databunker/values.schema.json          | 4 ++--
 charts/databunker/values.yaml                 | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/databunker/templates/_certificates.tpl b/charts/databunker/templates/_certificates.tpl
index a82364a..01b207d 100644
--- a/charts/databunker/templates/_certificates.tpl
+++ b/charts/databunker/templates/_certificates.tpl
@@ -85,7 +85,7 @@ Return the proper image name used for setting up Certificates
 - name: custom-certificate
   secret:
     secretName: {{ .Values.certificates.customCertificate.certificateSecret }}
-{{- if .Values.certificates.customCertificate.chainSecret }}
+{{- if .Values.certificates.customCertificate.chainSecret.name }}
 - name: custom-certificate-chain
   secret:
     secretName: {{ .Values.certificates.customCertificate.chainSecret.name }}
@@ -114,7 +114,7 @@ Return the proper image name used for setting up Certificates
   mountPath: {{ .Values.certificates.customCertificate.keyLocation }}
   subPath: tls.key
   readOnly: true
-{{- if .Values.certificates.customCertificate.chainSecret }}
+{{- if .Values.certificates.customCertificate.chainSecret.name }}
 - name: custom-certificate-chain
   mountPath: {{ .Values.certificates.customCertificate.chainLocation }}
   subPath: {{ .Values.certificates.customCertificate.chainSecret.key }}
diff --git a/charts/databunker/templates/deployment.yaml b/charts/databunker/templates/deployment.yaml
index 4e6f697..c130dcd 100644
--- a/charts/databunker/templates/deployment.yaml
+++ b/charts/databunker/templates/deployment.yaml
@@ -129,7 +129,7 @@ spec:
             - name: SMTP_PROTOCOL
               value: {{ .Values.smtpProtocol | quote }}
             {{- end }}
-            {{- if .Values.certificates.customCAs }}
+            {{- if (or .Values.certificates.customCAs .Values.certificates.customCertificate.certificateSecret) }}
             - name: SSL_CERTIFICATE
               value: {{ .Values.certificates.customCertificate.certificateLocation }}
             - name: SSL_CERTIFICATE_KEY
diff --git a/charts/databunker/templates/secrets.yaml b/charts/databunker/templates/secrets.yaml
index 6e7421b..5613430 100644
--- a/charts/databunker/templates/secrets.yaml
+++ b/charts/databunker/templates/secrets.yaml
@@ -16,7 +16,7 @@ data:
   {{- if .Values.databunkerMasterkey }}
   databunker-masterkey: {{ default "" .Values.databunkerMasterkey | b64enc | quote }}
   {{- else }}
-  databunker-masterkey: {{ substr 1 49 (printf "%x%x%x%x%x" (int64 (randNumeric 18)) (int64 (randNumeric 18)) (int64 (randNumeric 18)) (int64 (randNumeric 18)) (int64 (randNumeric 18)) ) | b64enc | quote }}
+  databunker-masterkey: {{ substr 1 49 (printf "%x%x%x%x%x%x" (int64 (randNumeric 18)) (int64 (randNumeric 18)) (int64 (randNumeric 18)) (int64 (randNumeric 18)) (int64 (randNumeric 18)) (int64 (randNumeric 18)) ) | b64enc | quote }}
   {{- end }}
   {{- if .Values.databunkerRoottoken }}
   databunker-roottoken: {{ default "" .Values.databunkerRoottoken | b64enc | quote }}
diff --git a/charts/databunker/values.schema.json b/charts/databunker/values.schema.json
index 82fc569..b56ea68 100644
--- a/charts/databunker/values.schema.json
+++ b/charts/databunker/values.schema.json
@@ -6,13 +6,13 @@
       "type": "string",
       "title": "Masterkey",
       "form": true,
-      "description": "Defaults to a random 24-character hex string if not set"
+      "description": "Defaults to a random 48 char hex string if not set"
     },
     "databunkerRoottoken": {
       "type": "string",
       "title": "Roottoken",
       "form": true,
-      "description": "Defaults to a random uuid string if not set"
+      "description": "Defaults to a random UUID string if not set"
     },
     "databunkerEmail": {
       "type": "string",
diff --git a/charts/databunker/values.yaml b/charts/databunker/values.yaml
index 6c54f70..46b9642 100644
--- a/charts/databunker/values.yaml
+++ b/charts/databunker/values.yaml
@@ -87,7 +87,7 @@ databunkerSkipInstall: false
 ## ref: https://github.com/bitnami/bitnami-docker-databunker#configuration
 ##
 databunkerHost: "localhost"
-## @param databunkerMasterkey Databunker main encyption key (24 char hext string)
+## @param databunkerMasterkey Databunker main encyption key (48 char hex string)
 ## ref: https://github.com/bitnami/bitnami-docker-databunker#configuration
 ##
 databunkerMasterkey: ""