From db148c8aeb6f373b1cbf4d8cf3f7eae5c1847360 Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Wed, 5 Apr 2023 16:46:53 +0200 Subject: [PATCH 1/2] Fix trustDomain global for oidc discovery provider (#193) --- .../spiffe-oidc-discovery-provider/templates/configmap.yaml | 2 +- charts/spire/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/templates/configmap.yaml b/charts/spire/charts/spiffe-oidc-discovery-provider/templates/configmap.yaml index a0ec2bfb4..1078b3383 100644 --- a/charts/spire/charts/spiffe-oidc-discovery-provider/templates/configmap.yaml +++ b/charts/spire/charts/spiffe-oidc-discovery-provider/templates/configmap.yaml @@ -31,7 +31,7 @@ data: workload_api { socket_path = {{ include "spiffe-oidc-discovery-provider.workload-api-socket-path" . | quote }} - trust_domain = "{{ .Values.trustDomain }}" + trust_domain = {{ include "spiffe-oidc-discovery-provider.trust-domain" . | quote }} } health_checks { diff --git a/charts/spire/values.yaml b/charts/spire/values.yaml index 72e07e169..316741b5d 100644 --- a/charts/spire/values.yaml +++ b/charts/spire/values.yaml @@ -2,12 +2,12 @@ global: k8s: # -- This is the value of your clusters `kubeadm init --service-dns-domain` flag - clusterDomain: "cluster.local" + clusterDomain: cluster.local spire: # -- Set the name of the Kubernetes cluster - clusterName: "example-cluster" + clusterName: example-cluster # -- Set the trust domain to use for the spiffe identifiers - trustDomain: "example.org" + trustDomain: example.org # -- Override all instances of bundleConfigMap bundleConfigMap: "" From f6219d9627f582923d5c0fd6a7b7ff7b4e299eaa Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Thu, 6 Apr 2023 09:01:24 +0200 Subject: [PATCH 2/2] Bump spire Helm Chart version from 0.6.0 to 0.6.1 * db148c8 Fix trustDomain global for oidc discovery provider (#193) Signed-off-by: Marco Franssen --- charts/spire/Chart.yaml | 2 +- charts/spire/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/spire/Chart.yaml b/charts/spire/Chart.yaml index 8519d5c5c..5b3182d82 100644 --- a/charts/spire/Chart.yaml +++ b/charts/spire/Chart.yaml @@ -3,7 +3,7 @@ name: spire description: > 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. type: application -version: 0.6.0 +version: 0.6.1 appVersion: "1.6.1" keywords: ["spiffe", "spire", "spire-server", "spire-agent", "oidc", "spire-controller-manager"] home: https://github.com/spiffe/helm-charts/tree/main/charts/spire diff --git a/charts/spire/README.md b/charts/spire/README.md index 4b083ebd1..d16ee1a22 100644 --- a/charts/spire/README.md +++ b/charts/spire/README.md @@ -2,7 +2,7 @@ -![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.1](https://img.shields.io/badge/AppVersion-1.6.1-informational?style=flat-square) +![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.1](https://img.shields.io/badge/AppVersion-1.6.1-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.