From b7d8590b775e57da4450a6a80a46258e66766564 Mon Sep 17 00:00:00 2001 From: Mariusz Sabath Date: Tue, 28 Nov 2023 19:13:32 -0500 Subject: [PATCH] Fix missing protocol in JWT Issuer (#120) * Add missing protocol to jwt_issuer Signed-off-by: Mariusz Sabath * Removed trailing spaces Signed-off-by: Mariusz Sabath --------- Signed-off-by: Mariusz Sabath --- .../charts/spire-server/templates/configmap.yaml | 12 ++++++------ charts/spire/templates/_spire-lib.tpl | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/spire/charts/spire-server/templates/configmap.yaml b/charts/spire/charts/spire-server/templates/configmap.yaml index e366716..a677810 100644 --- a/charts/spire/charts/spire-server/templates/configmap.yaml +++ b/charts/spire/charts/spire-server/templates/configmap.yaml @@ -206,7 +206,7 @@ plugins: {{- fail "You can only enable a single authentication mechanism to an upstream Vault." }} {{- end }} {{- end }} - {{- end }} + {{- end }} {{- with .Values.upstreamAuthority.awsPCA }} {{- if eq (.enabled | toString) "true" }} @@ -219,18 +219,18 @@ plugins: ca_signing_template_arn: {{ .caSigningTemplateARN | default "arn:aws:acm-pca:::template/SubordinateCACertificate_PathLen0/V1" | quote }} {{- if ne .signingAlgorithm "" }} signing_algorithm: {{ .signingAlgorithm | quote }} - {{- end }} + {{- end }} {{- if ne .assumeRoleARN "" }} assume_role_arn: {{ .assumeRoleARN | quote }} - {{- end }} + {{- end }} {{- if ne .endpoint "" }} endpoint: {{ .endpoint | quote }} - {{- end }} + {{- end }} {{- if ne .supplementalBundlePath "" }} supplemental_bundle_path: {{ .supplementalBundlePath | quote }} - {{- end }} + {{- end }} + {{- end }} {{- end }} - {{- end }} {{- if gt $upstreamAuthorityUsed 1 }} {{- fail "You can only enable a single Upstream Authority." }} {{- end }} diff --git a/charts/spire/templates/_spire-lib.tpl b/charts/spire/templates/_spire-lib.tpl index 2208abe..8536e22 100644 --- a/charts/spire/templates/_spire-lib.tpl +++ b/charts/spire/templates/_spire-lib.tpl @@ -20,7 +20,7 @@ {{- else if ne (len .Values.jwtIssuer) 0 }} {{- .Values.jwtIssuer }} {{- else }} -{{- printf "oidc-discovery.%s" (include "spire-lib.trust-domain" .) }} +{{- printf "https://oidc-discovery.%s" (include "spire-lib.trust-domain" .) }} {{- end }} {{- end }}