panxiao81/helm-charts-hardened
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align tornjak clientCA naming convention (#393)

Browse Source
This commit is contained in:
Marco Franssen
2023-07-19 09:13:50 -07:00
committed by GitHub
parent f05cb4fe1e
commit 522066e9f9
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/spire/charts/spire-server/templates/_helpers.tpl
+2 -2
View File
@@ -180,8 +180,8 @@ The code below determines what connection type should be used.
{{- if (lookup "v1" "Secret" (include "spire-server.namespace" .) .Values.tornjak.config.tlsSecret) -}}
{{- $caType := default "INVALID" .Values.tornjak.config.userCA.type }}
{{- if (lookup "v1" $caType (include "spire-server.namespace" .) .Values.tornjak.config.userCA.name) -}}
{{- $caType := default "INVALID" .Values.tornjak.config.clientCA.type }}
{{- if (lookup "v1" $caType (include "spire-server.namespace" .) .Values.tornjak.config.clientCA.name) -}}
{{- printf "mtls" -}}
{{- else }}
{{- printf "tls" -}}
charts/spire/charts/spire-server/templates/statefulset.yaml
+4 -4
View File
@@ -253,15 +253,15 @@ spec:
secretName: {{ .Values.tornjak.config.tlsSecret }}
{{- end }}
{{- if eq (include "spire-tornjak.connectionType" .) "mtls" }}
{{- if eq .Values.tornjak.config.userCA.type "Secret" }}
{{- if eq .Values.tornjak.config.clientCA.type "Secret" }}
- name: user-cert
secret:
defaultMode: 256
secretName: {{ .Values.tornjak.config.userCA.name }}
{{- else if eq .Values.tornjak.config.userCA.type "ConfigMap" }}
secretName: {{ .Values.tornjak.config.clientCA.name }}
{{- else if eq .Values.tornjak.config.clientCA.type "ConfigMap" }}
- name: user-cert
configMap:
name: {{ .Values.tornjak.config.userCA.name }}
name: {{ .Values.tornjak.config.clientCA.name }}
{{- end }}
{{- end }}
{{- if eq (.Values.upstreamAuthority.disk.enabled | toString) "true" }}