Merge branch 'main' into release

This commit is contained in:
Marco Franssen
2023-04-06 09:46:22 +02:00
4 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ name: spire
description: > 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. 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 type: application
version: 0.6.0 version: 0.6.1
appVersion: "1.6.1" appVersion: "1.6.1"
keywords: ["spiffe", "spire", "spire-server", "spire-agent", "oidc", "spire-controller-manager"] keywords: ["spiffe", "spire", "spire-server", "spire-agent", "oidc", "spire-controller-manager"]
home: https://github.com/spiffe/helm-charts/tree/main/charts/spire home: https://github.com/spiffe/helm-charts/tree/main/charts/spire
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- This README.md is generated. Please edit README.md.gotmpl --> <!-- 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) [![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. 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.
@@ -31,7 +31,7 @@ data:
workload_api { workload_api {
socket_path = {{ include "spiffe-oidc-discovery-provider.workload-api-socket-path" . | quote }} 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 { health_checks {
+3 -3
View File
@@ -2,12 +2,12 @@
global: global:
k8s: k8s:
# -- This is the value of your clusters `kubeadm init --service-dns-domain` flag # -- This is the value of your clusters `kubeadm init --service-dns-domain` flag
clusterDomain: "cluster.local" clusterDomain: cluster.local
spire: spire:
# -- Set the name of the Kubernetes cluster # -- Set the name of the Kubernetes cluster
clusterName: "example-cluster" clusterName: example-cluster
# -- Set the trust domain to use for the spiffe identifiers # -- Set the trust domain to use for the spiffe identifiers
trustDomain: "example.org" trustDomain: example.org
# -- Override all instances of bundleConfigMap # -- Override all instances of bundleConfigMap
bundleConfigMap: "" bundleConfigMap: ""