From a09e054d04cd68fcf3090c35ffba5d3d09d80683 Mon Sep 17 00:00:00 2001 From: Drew Wells Date: Mon, 31 Jul 2023 12:54:01 -0500 Subject: [PATCH] support annotations so oidc can be annotated (#391) Signed-off-by: Drew Wells Signed-off-by: Drew Wells Co-authored-by: Faisal Memon --- charts/spire/README.md | 1 + charts/spire/charts/spiffe-oidc-discovery-provider/README.md | 1 + .../spiffe-oidc-discovery-provider/templates/deployment.yaml | 4 ++++ .../spire/charts/spiffe-oidc-discovery-provider/values.yaml | 3 +++ 4 files changed, 9 insertions(+) diff --git a/charts/spire/README.md b/charts/spire/README.md index 219ab87..0defba2 100644 --- a/charts/spire/README.md +++ b/charts/spire/README.md @@ -156,6 +156,7 @@ Now you can interact with the Spire agent socket from your own application. The | spiffe-csi-driver.tolerations | list | `[]` | | | spiffe-oidc-discovery-provider.affinity | object | `{}` | | | spiffe-oidc-discovery-provider.agentSocketName | string | `"spire-agent.sock"` | The name of the spire-agent unix socket | +| spiffe-oidc-discovery-provider.annotations | object | `{}` | Annotations for the deployment | | spiffe-oidc-discovery-provider.autoscaling.enabled | bool | `false` | | | spiffe-oidc-discovery-provider.autoscaling.maxReplicas | int | `5` | | | spiffe-oidc-discovery-provider.autoscaling.minReplicas | int | `1` | | diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/README.md b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md index b23bc23..e477695 100644 --- a/charts/spire/charts/spiffe-oidc-discovery-provider/README.md +++ b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md @@ -31,6 +31,7 @@ A Helm chart to install the SPIFFE OIDC discovery provider. |-----|------|---------|-------------| | affinity | object | `{}` | | | agentSocketName | string | `"spire-agent.sock"` | The name of the spire-agent unix socket | +| annotations | object | `{}` | Annotations for the deployment | | autoscaling.enabled | bool | `false` | | | autoscaling.maxReplicas | int | `5` | | | autoscaling.minReplicas | int | `1` | | diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/templates/deployment.yaml b/charts/spire/charts/spiffe-oidc-discovery-provider/templates/deployment.yaml index 4110a83..b5aaa90 100644 --- a/charts/spire/charts/spiffe-oidc-discovery-provider/templates/deployment.yaml +++ b/charts/spire/charts/spiffe-oidc-discovery-provider/templates/deployment.yaml @@ -6,6 +6,10 @@ metadata: namespace: {{ include "spiffe-oidc-discovery-provider.namespace" . }} labels: {{- include "spiffe-oidc-discovery-provider.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCount }} diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml b/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml index 07d683a..02d5cc6 100644 --- a/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml +++ b/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml @@ -12,6 +12,9 @@ replicaCount: 1 namespaceOverride: "" +# -- Annotations for the deployment +annotations: {} + image: # -- The OCI registry to pull the image from registry: ghcr.io