Make ports configurable and fix docs

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
spiffe · Feb 23, 2023 · 2c5aff1 · 2c5aff1
1 parent a6d7db4
commit 2c5aff1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/charts/spire/charts/spire-agent/README.md b/charts/spire/charts/spire-agent/README.md
@@ -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"` |  |
@@ -30,6 +31,7 @@ A Helm chart to install the SPIRE agent.
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.name | string | `""` |  |
 | telemetry.prometheus.enabled | bool | `false` |  |
+| telemetry.prometheus.port | int | `9988` |  |
 | trustDomain | string | `"example.org"` |  |
 | waitForIt.image.pullPolicy | string | `"IfNotPresent"` |  |
 | waitForIt.image.registry | string | `"cgr.dev"` |  |

diff --git a/charts/spire/charts/spire-agent/templates/configmap.yaml b/charts/spire/charts/spire-agent/templates/configmap.yaml
@@ -45,7 +45,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"
     }
@@ -54,7 +54,7 @@ data:
     telemetry {
       Prometheus {
         host = "0.0.0.0"
-        port = 9988
+        port = {{ .Values.telemetry.prometheus.port }}
       }
     }
     {{- end }}
diff --git a/charts/spire/charts/spire-agent/templates/daemonset.yaml b/charts/spire/charts/spire-agent/templates/daemonset.yaml
@@ -60,13 +60,13 @@ spec:
           livenessProbe:
             httpGet:
               path: /live
-              port: 8080
+              port: {{ .Values.healthChecks.port }}
             initialDelaySeconds: 15
             periodSeconds: 60
           readinessProbe:
             httpGet:
               path: /ready
-              port: 8080
+              port: {{ .Values.healthChecks.port }}
             initialDelaySeconds: 15
             periodSeconds: 60
           resources:

diff --git a/charts/spire/charts/spire-agent/values.yaml b/charts/spire/charts/spire-agent/values.yaml
@@ -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
@@ -72,3 +76,4 @@ waitForIt:
 telemetry:
   prometheus:
     enabled: false
+    port: 9988
diff --git a/charts/spire/values.yaml b/charts/spire/values.yaml
@@ -1,7 +1,7 @@
 #global:
 #  telemetry:
 #    prometheus:
-#      enabled: false|true
+#      enabled: true
 
 nameOverride: ""
 fullnameOverride: ""