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

issuer naming should respect issuer_name override (#378)

Browse Source 
align the spire-server configmap and issuer CR naming

---------

Signed-off-by: Drew Wells <[email protected]>
Signed-off-by: Faisal Memon <[email protected]>
Co-authored-by: Faisal Memon <[email protected]>
This commit is contained in:
Drew Wells
2023-08-02 14:22:59 -07:00
committed by GitHub
co-authored by Faisal Memon
parent a2e5c36cc9
commit d2e1606286
3 changed files with 6 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
@@ -78,7 +78,7 @@ plugins:
UpstreamAuthority: UpstreamAuthority:
- cert-manager: - cert-manager:
plugin_data: plugin_data:
issuer_name: {{ default (include "spire-server.fullname" $root) .issuer_name }} issuer_name: {{ default (include "spire-server.fullname" $root) .issuer_name }}-ca
issuer_kind: {{ .issuer_kind | quote }} issuer_kind: {{ .issuer_kind | quote }}
issuer_group: {{ .issuer_group | quote }} issuer_group: {{ .issuer_group | quote }}
namespace: {{ default $root.Release.Namespace .namespace | quote }} namespace: {{ default $root.Release.Namespace .namespace | quote }}
charts/spire/charts/spire-server/templates/issuer.yaml
+4 -3
View File
@@ -1,12 +1,13 @@
{{- with .Values.upstreamAuthority.certManager }} {{- with .Values.upstreamAuthority.certManager }}
{{ if and .enabled .ca.create }} {{ if and .enabled .ca.create }}
{{ $issuerName := printf "%s-selfsigned" (default (include "spire-server.fullname" $) .issuer_name) }}
{{/* {{/*
Configuring CA Issuer: https://cert-manager.io/docs/configuration/ca/ Configuring CA Issuer: https://cert-manager.io/docs/configuration/ca/
*/}} */}}
apiVersion: cert-manager.io/v1 apiVersion: cert-manager.io/v1
kind: Issuer kind: Issuer
metadata: metadata:
name: {{ include "spire-server.fullname" $ }}-selfsigned name: {{ $issuerName }}
namespace: {{ include "spire-server.namespace" $ }} namespace: {{ include "spire-server.namespace" $ }}
labels: labels:
{{- include "spire-server.labels" $ | nindent 4}} {{- include "spire-server.labels" $ | nindent 4}}
@@ -38,14 +39,14 @@ spec:
renewBefore: {{ . }} renewBefore: {{ . }}
{{- end }} {{- end }}
issuerRef: issuerRef:
name: {{ include "spire-server.fullname" $ }}-selfsigned name: {{ $issuerName }}
kind: Issuer kind: Issuer
group: cert-manager.io group: cert-manager.io
--- ---
apiVersion: cert-manager.io/v1 apiVersion: cert-manager.io/v1
kind: Issuer kind: Issuer
metadata: metadata:
name: {{ include "spire-server.fullname" $ }} name: {{ include "spire-server.fullname" $ }}-ca
namespace: {{ include "spire-server.namespace" $ }} namespace: {{ include "spire-server.namespace" $ }}
spec: spec:
ca: ca:
charts/spire/charts/spire-server/templates/statefulset.yaml
+1 -1
View File
@@ -58,7 +58,7 @@ spec:
- --timeout=3m - --timeout=3m
- --for=condition=ready - --for=condition=ready
- issuer - issuer
- {{ include "spire-server.fullname" $ }} - {{ include "spire-server.fullname" $ }}-ca
imagePullPolicy: {{ .Values.tools.kubectl.image.pullPolicy }} imagePullPolicy: {{ .Values.tools.kubectl.image.pullPolicy }}
{{- end }} {{- end }}
{{- if gt (len .Values.initContainers) 0 }} {{- if gt (len .Values.initContainers) 0 }}