Allow to use external created secret

Signed-off-by: Marco Franssen <[email protected]> Signed-off-by: Marco Franssen <[email protected]>
2023-02-18 13:04:09 +01:00
parent 786c6a5d89
commit 93156bf904
6 changed files with 34 additions and 14 deletions
@@ -1,18 +1,20 @@
 {{- $root := . }}
 {{- with .Values.server.config.upstreamAuthority.disk }}
-{{- if eq (.enabled | toString) "true" }}
+{{- if and (eq (.enabled | toString) "true") (eq (.secret.create | toString) "true") }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "spire.fullname" $root }}-upstream-ca
+  name: {{ include "spire.server-upstream-ca-secret" $root }}
  namespace: {{ $root.Release.Namespace }}
  labels:
    {{- include "spire.server.labels" $root | nindent 4 }}
 data:
-  tls.crt: {{ .certificate | toYaml | indent 2 }}
-  tls.key: {{ .key | toYaml | indent 2 }}
+  {{- with .secret.data }}
+  tls.crt: {{ .certificate | b64enc }}
+  tls.key: {{ .key | b64enc }}
  {{- if ne .bundle ""}}
-  bundle.crt: {{ .bundle | toYaml | indent 2 }}
+  bundle.crt: {{ .bundle | b64enc }}
+  {{- end }}
  {{- end }}
 {{- end }}
 {{- end }}