From ba41f04df525dee262dd0ca2e5d116685640fbbb Mon Sep 17 00:00:00 2001
From: Marco Franssen <marco.franssen@gmail.com>
Date: Fri, 24 Feb 2023 21:38:51 +0100
Subject: [PATCH] Fix spire-controller-manager healthz port

This to align with the spire-controller-manager-configmap.yaml

Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
---
 .../controller-manager-configmap.yaml         |  4 ++--
 .../spire-server/templates/statefulset.yaml   | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/charts/spire/charts/spire-server/templates/controller-manager-configmap.yaml b/charts/spire/charts/spire-server/templates/controller-manager-configmap.yaml
index 4a329ed..6bac1e6 100644
--- a/charts/spire/charts/spire-server/templates/controller-manager-configmap.yaml
+++ b/charts/spire/charts/spire-server/templates/controller-manager-configmap.yaml
@@ -15,8 +15,8 @@ data:
         {{- include "spire-server.labels" . | nindent 8 }}
     metrics:
       bindAddress: 0.0.0.0:8082
-    healthProbe:
-      bindAddress: 127.0.0.1:8083
+    health:
+      healthProbeBindAddress: 0.0.0.0:8083
     leaderElection:
       leaderElect: true
       resourceName: {{ .Release.Name | sha256sum | trunc 8 }}.spiffe.io
diff --git a/charts/spire/charts/spire-server/templates/statefulset.yaml b/charts/spire/charts/spire-server/templates/statefulset.yaml
index 2f24265..ac499a2 100644
--- a/charts/spire/charts/spire-server/templates/statefulset.yaml
+++ b/charts/spire/charts/spire-server/templates/statefulset.yaml
@@ -96,21 +96,20 @@ spec:
             - name: https
               containerPort: 9443
               protocol: TCP
-            - containerPort: 8008
+            - containerPort: 8083
               name: healthz
             {{- if (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) }}
             - containerPort: 8082
               name: prom2
             {{- end }}
-          # TODO: implement probes
-          # livenessProbe:
-          #   httpGet:
-          #     path: /
-          #     port: healthz
-          # readinessProbe:
-          #   httpGet:
-          #     path: /
-          #     port: healthz
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: healthz
+          readinessProbe:
+            httpGet:
+              path: /readyz
+              port: healthz
           resources:
             {{- toYaml .Values.controllerManager.resources | nindent 12 }}
           volumeMounts: