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

Fix duplicate securityContext section in spire-agent (#279)

Browse Source 
A duplicate section was added due to incorrect merge conflict resolution.
Helm seems ok with it but Kustomize + FluxCD has issues with it.

Signed-off-by: Kevin Fox <[email protected]>
This commit is contained in:
kfox1111
2024-03-07 09:52:00 -08:00
committed by GitHub
parent 058e841881
commit fd3b7d5fc7
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/spire/charts/spire-agent/templates/daemonset.yaml
-2
View File
@@ -108,8 +108,6 @@ spec:
image: {{ template "spire-lib.image" (dict "image" .Values.waitForIt.image "global" .Values.global) }} image: {{ template "spire-lib.image" (dict "image" .Values.waitForIt.image "global" .Values.global) }}
imagePullPolicy: {{ .Values.waitForIt.image.pullPolicy }} imagePullPolicy: {{ .Values.waitForIt.image.pullPolicy }}
args: ["-t", "30", "-h", "{{ include "spire-agent.server-address" . | trim }}", "-p", {{ .Values.server.port | quote }}] args: ["-t", "30", "-h", "{{ include "spire-agent.server-address" . | trim }}", "-p", {{ .Values.server.port | quote }}]
securityContext:
{{- .Values.securityContext | toYaml | nindent 12 }}
resources: resources:
{{- toYaml .Values.waitForIt.resources | nindent 12 }} {{- toYaml .Values.waitForIt.resources | nindent 12 }}
securityContext: securityContext: