support for certificates stored in external secrets

This commit is contained in:
stremovsky
2021-12-23 18:57:00 +02:00
parent 1bc8d07f59
commit 7eac63fcf2
5 changed files with 7 additions and 7 deletions

View File

@@ -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 }}

View File

@@ -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

View File

@@ -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 }}

View File

@@ -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",

View File

@@ -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: ""