From 9bd7f43056cb6f3d9adaa11accb94a1782e88d1d Mon Sep 17 00:00:00 2001 From: Andrew Block Date: Wed, 25 Oct 2023 12:26:22 -0500 Subject: [PATCH] Added environment variable to spire-agent to inject node name Signed-off-by: Andrew Block --- charts/spire/README.md | 2 +- charts/spire/charts/spire-agent/README.md | 1 + charts/spire/charts/spire-agent/templates/daemonset.yaml | 4 ++++ charts/spire/charts/spire-agent/values.yaml | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/spire/README.md b/charts/spire/README.md index e54be82..51bb60e 100644 --- a/charts/spire/README.md +++ b/charts/spire/README.md @@ -1,6 +1,6 @@ # spire -![Version: 0.14.0](https://img.shields.io/badge/Version-0.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.7.2](https://img.shields.io/badge/AppVersion-1.7.2-informational?style=flat-square) +![Version: 0.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.7.2](https://img.shields.io/badge/AppVersion-1.7.2-informational?style=flat-square) [![Development Phase](https://github.com/spiffe/spiffe/blob/main/.img/maturity/dev.svg)](https://github.com/spiffe/spiffe/blob/main/MATURITY.md#development) A Helm chart for deploying the complete Spire stack including: spire-server, spire-agent, spiffe-csi-driver, spiffe-oidc-discovery-provider and spire-controller-manager. diff --git a/charts/spire/charts/spire-agent/README.md b/charts/spire/charts/spire-agent/README.md index d200d9b..aa3aca8 100644 --- a/charts/spire/charts/spire-agent/README.md +++ b/charts/spire/charts/spire-agent/README.md @@ -92,6 +92,7 @@ A Helm chart to install the SPIRE agent. | `telemetry.prometheus.podMonitor.labels` | Pod labels to filter for prometheus monitoring | `{}` | | `socketPath` | The unix socket path to the spire-agent | `/run/spire/agent-sockets/spire-agent.sock` | | `priorityClassName` | Priority class assigned to daemonset pods | `""` | +| `extraEnvVars` | Extra environment variables to be added to the Spire Agent container | `[]` | | `extraVolumes` | Extra volumes to be mounted on Spire Agent pods | `[]` | | `extraVolumeMounts` | Extra volume mounts for Spire Agent pods | `[]` | | `extraContainers` | Additional containers to create with Spire Agent pods | `[]` | diff --git a/charts/spire/charts/spire-agent/templates/daemonset.yaml b/charts/spire/charts/spire-agent/templates/daemonset.yaml index c463212..57c3a31 100644 --- a/charts/spire/charts/spire-agent/templates/daemonset.yaml +++ b/charts/spire/charts/spire-agent/templates/daemonset.yaml @@ -71,6 +71,10 @@ spec: image: {{ template "spire-lib.image" (dict "appVersion" $.Chart.AppVersion "image" .Values.image "global" .Values.global) }} imagePullPolicy: {{ .Values.image.pullPolicy }} args: ["-config", "/run/spire/config/agent.conf"] + {{- if gt (len .Values.extraEnvVars) 0 }} + env: + {{- toYaml .Values.extraEnvVars | nindent 12 }} + {{- end }} ports: - containerPort: {{ .Values.healthChecks.port }} name: healthz diff --git a/charts/spire/charts/spire-agent/values.yaml b/charts/spire/charts/spire-agent/values.yaml index 0897979..f2ada59 100644 --- a/charts/spire/charts/spire-agent/values.yaml +++ b/charts/spire/charts/spire-agent/values.yaml @@ -204,6 +204,9 @@ socketPath: /run/spire/agent-sockets/spire-agent.sock ## @param priorityClassName Priority class assigned to daemonset pods priorityClassName: "" +## @param extraEnvVars [array] Extra environment variables to be added to the Spire Agent container +extraEnvVars: [] + ## @param extraVolumes [array] Extra volumes to be mounted on Spire Agent pods extraVolumes: []