Align healthz ports and checks across containers

Signed-off-by: Marco Franssen <[email protected]>
2023-02-24 21:06:09 +01:00
parent 156052ada0
commit 495d9d67e8
6 changed files with 22 additions and 10 deletions
@@ -13,6 +13,7 @@ A Helm chart to install the SPIRE agent.
 | bundleConfigMap | string | `"spire-bundle"` |  |
 | clusterName | string | `"example-cluster"` |  |
 | fullnameOverride | string | `""` |  |
+| healthChecks.port | int | `9980` | override the host port used for health checking |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.registry | string | `"ghcr.io"` |  |
 | image.repository | string | `"spiffe/spire-agent"` |  |
@@ -47,7 +47,7 @@ data:
    health_checks {
      listener_enabled = true
      bind_address = "0.0.0.0"
-      bind_port = "8080"
+      bind_port = {{ .Values.healthChecks.port | quote }}
      live_path = "/live"
      ready_path = "/ready"
    }
@@ -43,6 +43,9 @@ spec:
          image: {{ template "spire-agent.image" (dict "appVersion" $.Chart.AppVersion "image" .Values.image) }}
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          args: ["-config", "/run/spire/config/agent.conf"]
+          ports:
+            - containerPort: {{ .Values.healthChecks.port }}
+              name: healthz
          volumeMounts:
            - name: spire-config
              mountPath: /run/spire/config
@@ -58,13 +61,13 @@ spec:
          livenessProbe:
            httpGet:
              path: /live
-              port: 8080
+              port: healthz
            initialDelaySeconds: 15
            periodSeconds: 60
          readinessProbe:
            httpGet:
              path: /ready
-              port: 8080
+              port: healthz
            initialDelaySeconds: 15
            periodSeconds: 60
          resources:
@@ -61,6 +61,10 @@ bundleConfigMap: spire-bundle
 server:
  port: 8081

+healthChecks:
+  # -- override the host port used for health checking
+  port: 9980
+
 waitForIt:
  image:
    registry: cgr.dev