helm: Correct spire labels indentation

Additionally, the labels are propagated to pod level as well. Fixes: #28599 Signed-off-by: Tam Mach <tam.mach@cilium.io>
cilium · Oct 16, 2023 · ad449fe · ad449fe
1 parent a0899b9
commit ad449fe
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/install/kubernetes/cilium/templates/spire/agent/daemonset.yaml b/install/kubernetes/cilium/templates/spire/agent/daemonset.yaml
@@ -15,8 +15,8 @@ metadata:
   {{- end }}
   labels:
     app: spire-agent
-  {{- with .Values.authentication.mutual.spire.install.server.labels }}
-    {{- toYaml . | nindent 8 }}
+  {{- with .Values.authentication.mutual.spire.install.agent.labels }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   selector:
@@ -27,6 +27,9 @@ spec:
       namespace: {{ .Values.authentication.mutual.spire.install.namespace }}
       labels:
         app: spire-agent
+        {{- with .Values.authentication.mutual.spire.install.agent.labels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       hostPID: true
       hostNetwork: true

diff --git a/install/kubernetes/cilium/templates/spire/server/statefulset.yaml b/install/kubernetes/cilium/templates/spire/server/statefulset.yaml
@@ -16,7 +16,7 @@ metadata:
   labels:
     app: spire-server
   {{- with .Values.authentication.mutual.spire.install.server.labels }}
-    {{- toYaml . | nindent 8 }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   replicas: 1
@@ -28,6 +28,9 @@ spec:
     metadata:
       labels:
         app: spire-server
+        {{- with .Values.authentication.mutual.spire.install.server.labels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       serviceAccountName: {{ .Values.authentication.mutual.spire.install.server.serviceAccount.name }}
       shareProcessNamespace: true

diff --git a/install/kubernetes/cilium/values.yaml b/install/kubernetes/cilium/values.yaml
diff --git a/install/kubernetes/cilium/values.yaml.tmpl b/install/kubernetes/cilium/values.yaml.tmpl
@@ -3255,9 +3255,9 @@ authentication:
             create: true
             name: spire-agent
           # -- SPIRE agent annotations
-          annotations: { }
+          annotations: {}
           # -- SPIRE agent labels
-          labels: { }
+          labels: {}
           # -- SPIRE Workload Attestor kubelet verification.
           skipKubeletVerification: true
           # -- SPIRE agent tolerations configuration