From e6ef7256b9dbdc27f87efef3d864eb7c0e316f1b Mon Sep 17 00:00:00 2001
From: Marco Franssen <marco.franssen@gmail.com>
Date: Fri, 24 Feb 2023 21:17:17 +0100
Subject: [PATCH] Fixup adding telemetry port in wrong place

---
 .../spire/charts/spire-agent/templates/daemonset.yaml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/charts/spire/charts/spire-agent/templates/daemonset.yaml b/charts/spire/charts/spire-agent/templates/daemonset.yaml
index 61bf76b4f..4506adbda 100644
--- a/charts/spire/charts/spire-agent/templates/daemonset.yaml
+++ b/charts/spire/charts/spire-agent/templates/daemonset.yaml
@@ -48,6 +48,10 @@ spec:
           ports:
             - containerPort: {{ .Values.healthChecks.port }}
               name: healthz
+            {{- if (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) }}
+            - containerPort: {{ .Values.telemetry.prometheus.port }}
+              name: prom
+            {{- end }}
           volumeMounts:
             - name: spire-config
               mountPath: /run/spire/config
@@ -60,13 +64,6 @@ spec:
               readOnly: false
             - name: spire-token
               mountPath: /var/run/secrets/tokens
-          ports:
-            - containerPort: {{ .Values.healthChecks.port }}
-              name: health
-            {{- if (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) }}
-            - containerPort: {{ .Values.telemetry.prometheus.port }}
-              name: prom
-            {{- end }}
           livenessProbe:
             httpGet:
               path: /live