From f08ebd344e6e7fa0b66dcc12e5ce16b21f9e6aa7 Mon Sep 17 00:00:00 2001 From: Mariusz Sabath Date: Thu, 2 Nov 2023 12:38:33 -0400 Subject: [PATCH] Patch Tornjak ingress (#74) * Fix the tornjak backend tornjak Signed-off-by: Mariusz Sabath * Revert "Fix the tornjak backend tornjak" This reverts commit cef5505fab940af34be8cfef3e210f020c2f36a1. Signed-off-by: Mariusz Sabath * Fix the tornjak backend tornjak Signed-off-by: Mariusz Sabath --------- Signed-off-by: Mariusz Sabath --- charts/spire/charts/spire-server/templates/tornjak-ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/spire/charts/spire-server/templates/tornjak-ingress.yaml b/charts/spire/charts/spire-server/templates/tornjak-ingress.yaml index 7b0752c..f669c70 100644 --- a/charts/spire/charts/spire-server/templates/tornjak-ingress.yaml +++ b/charts/spire/charts/spire-server/templates/tornjak-ingress.yaml @@ -1,7 +1,7 @@ {{- if .Values.tornjak.ingress.enabled -}} {{- $ingressControllerType := include "spire-lib.ingress-controller-type" (dict "global" .Values.global "ingress" .Values.tornjak.ingress) }} {{- $fullName := include "spire-tornjak.fullname" . -}} -{{- $annotations := deepCopy .Values.ingress.annotations }} +{{- $annotations := deepCopy .Values.tornjak.ingress.annotations }} {{- if eq $ingressControllerType "ingress-nginx" }} {{- $_ := set $annotations "nginx.ingress.kubernetes.io/ssl-redirect" "true" }} {{- $_ := set $annotations "nginx.ingress.kubernetes.io/force-ssl-redirect" "true" }}