Merge branch 'main' into release

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

charts/spire/README.md

@@ -2,7 +2,7 @@
 
 <!-- This README.md is generated. Please edit README.md.gotmpl -->
 
-![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.

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 {

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: ""