From fd3b7d5fc71da979136cbbafe86f84eb997b5634 Mon Sep 17 00:00:00 2001
From: kfox1111 <Kevin.Fox@pnnl.gov>
Date: Thu, 7 Mar 2024 09:52:00 -0800
Subject: [PATCH] Fix duplicate securityContext section in spire-agent (#279)

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 <Kevin.Fox@pnnl.gov>
---
 charts/spire/charts/spire-agent/templates/daemonset.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/charts/spire/charts/spire-agent/templates/daemonset.yaml b/charts/spire/charts/spire-agent/templates/daemonset.yaml
index 4e23f28..d94cd96 100644
--- a/charts/spire/charts/spire-agent/templates/daemonset.yaml
+++ b/charts/spire/charts/spire-agent/templates/daemonset.yaml
@@ -108,8 +108,6 @@ spec:
           image: {{ template "spire-lib.image" (dict "image" .Values.waitForIt.image "global" .Values.global) }}
           imagePullPolicy: {{ .Values.waitForIt.image.pullPolicy }}
           args: ["-t", "30", "-h", "{{ include "spire-agent.server-address" . | trim }}", "-p", {{ .Values.server.port | quote }}]
-          securityContext:
-            {{- .Values.securityContext | toYaml | nindent 12 }}
           resources:
             {{- toYaml .Values.waitForIt.resources | nindent 12 }}
           securityContext: