From 2c5aff16b7ebdacde2e729f0be22af1c26155cf2 Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Thu, 23 Feb 2023 08:58:30 -0800 Subject: [PATCH] Make ports configurable and fix docs Signed-off-by: Kevin Fox --- charts/spire/charts/spire-agent/README.md | 2 ++ charts/spire/charts/spire-agent/templates/configmap.yaml | 4 ++-- charts/spire/charts/spire-agent/templates/daemonset.yaml | 4 ++-- charts/spire/charts/spire-agent/values.yaml | 5 +++++ charts/spire/values.yaml | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/charts/spire/charts/spire-agent/README.md b/charts/spire/charts/spire-agent/README.md index b07a66780..f7ed27493 100644 --- 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 index 8c4ecce67..1be1207f5 100644 --- 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 index fa419d1d1..f7d183ae8 100644 --- 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 index ae63c3a27..2974409e1 100644 --- 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 index 0004c9621..e74175f95 100644 --- a/charts/spire/values.yaml +++ b/charts/spire/values.yaml @@ -1,7 +1,7 @@ #global: # telemetry: # prometheus: -# enabled: false|true +# enabled: true nameOverride: "" fullnameOverride: ""