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

Align config across components

Browse Source 
Signed-off-by: Marco Franssen <[email protected]>
This commit is contained in:
Marco Franssen
2023-02-18 13:04:05 +01:00
committed by Marco Franssen
parent 10f0138a25
commit e770a14629
5 changed files with 76 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/spire/templates/oidc-dp-configmap.yaml
+7 -7
View File
@@ -6,13 +6,13 @@ metadata:
namespace: {{ .Release.Namespace }}
data:
oidc-discovery-provider.conf: |
log_level = "{{ .Values.oidc.logLevel }}"
log_level = "{{ .Values.oidc.config.logLevel }}"
domains = [
"spire-oidc.{{ .Release.Namespace }}",
"spire-oidc.{{ .Release.Namespace }}.svc.cluster.local",
{{- if gt (len .Values.oidc.domains) 0 }}
"{{- join "\",\n \"" .Values.oidc.domains }}"
{{- if gt (len .Values.oidc.config.domains) 0 }}
"{{- join "\",\n \"" .Values.oidc.config.domains }}"
{{- end }}
]
@@ -21,10 +21,10 @@ data:
listen_socket_path = "/run/spire/oidc-sockets/oidc-server.sock"
{{- else }}
acme {
directory_url = "{{ .Values.oidc.acme.directoryUrl }}"
cache_dir = "{{ .Values.oidc.acme.cacheDir }}"
tos_accepted = {{ .Values.oidc.acme.tosAccepted }}
email = "{{ .Values.oidc.acme.emailAddress }}"
directory_url = "{{ .Values.oidc.config.acme.directoryUrl }}"
cache_dir = "{{ .Values.oidc.config.acme.cacheDir }}"
tos_accepted = {{ .Values.oidc.config.acme.tosAccepted }}
email = "{{ .Values.oidc.config.acme.emailAddress }}"
}
{{- end }}