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

Fix cert-manager upstream authority when enabling recommendations (#476)

Browse Source 
Signed-off-by: Yann Soubeyrand <[email protected]>
Co-authored-by: kfox1111 <[email protected]>
This commit is contained in:
Yann Soubeyrand
2024-10-17 14:14:20 -07:00
committed by GitHub
co-authored by kfox1111
parent ba8d993ff4
commit 7b409ed912
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/spire/charts/spire-server/templates/configmap.yaml
+1 -1
View File
@@ -334,7 +334,7 @@ plugins:
issuer_name: {{ default (printf "%s-ca" (include "spire-server.fullname" $root)) .issuerName }} issuer_name: {{ default (printf "%s-ca" (include "spire-server.fullname" $root)) .issuerName }}
issuer_kind: {{ .issuerKind | quote }} issuer_kind: {{ .issuerKind | quote }}
issuer_group: {{ .issuerGroup | quote }} issuer_group: {{ .issuerGroup | quote }}
namespace: {{ default $root.Release.Namespace .namespace | quote }} namespace: {{ default (include "spire-server.namespace" $) .namespace | quote }}
{{- if ne .kubeConfigFile "" }} {{- if ne .kubeConfigFile "" }}
kube_config_file: {{ .kubeConfigFile | quote }} kube_config_file: {{ .kubeConfigFile | quote }}
{{- end }} {{- end }}
charts/spire/charts/spire-server/templates/issuer.yaml
+3 -3
View File
@@ -21,14 +21,14 @@ metadata:
namespace: {{ include "spire-server.namespace" $ }} namespace: {{ include "spire-server.namespace" $ }}
spec: spec:
isCA: true isCA: true
commonName: {{ $.Values.caSubject.commonName }} commonName: {{ include "spire-server.ca-subject-common-name" $ | quote }}
secretName: {{ include "spire-server.fullname" $ }}-ca-keys secretName: {{ include "spire-server.fullname" $ }}-ca-keys
duration: {{ $.Values.upstreamAuthority.certManager.ca.duration }} duration: {{ $.Values.upstreamAuthority.certManager.ca.duration }}
subject: subject:
countries: countries:
- {{ $.Values.caSubject.country }} - {{ include "spire-server.ca-subject-country" $ | quote }}
organizations: organizations:
- {{ $.Values.caSubject.organization }} - {{ include "spire-server.ca-subject-organization" $ | quote }}
privateKey: privateKey:
algorithm: {{ $.Values.upstreamAuthority.certManager.ca.privateKey.algorithm }} algorithm: {{ $.Values.upstreamAuthority.certManager.ca.privateKey.algorithm }}
size: {{ $.Values.upstreamAuthority.certManager.ca.privateKey.size }} size: {{ $.Values.upstreamAuthority.certManager.ca.privateKey.size }}
charts/spire/charts/spire-server/templates/server-resource.yaml
+1 -1
View File
@@ -168,7 +168,7 @@ spec:
args: args:
- wait - wait
- --namespace - --namespace
- {{ .Release.Namespace }} - {{ include "spire-server.namespace" $ }}
- --timeout=3m - --timeout=3m
- --for=condition=ready - --for=condition=ready
- issuer - issuer