From a6ba72f35d4a8a936f61ad672c4466a1b8fb5d03 Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Tue, 14 May 2024 11:51:24 -0400
Subject: [PATCH] Fix certs for non-auth ingress

---
 charts/webservice/Chart.yaml             | 2 +-
 charts/webservice/templates/ingress.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/webservice/Chart.yaml b/charts/webservice/Chart.yaml
index 8f94054..8c682d1 100644
--- a/charts/webservice/Chart.yaml
+++ b/charts/webservice/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: webservice
 description: OSC webservice bootstrap Helm Chart
 type: application
-version: 0.34.4
+version: 0.34.5
 appVersion: "0.1.0"
 maintainers:
   - name: treydock
diff --git a/charts/webservice/templates/ingress.yaml b/charts/webservice/templates/ingress.yaml
index 83e3398..17956b7 100644
--- a/charts/webservice/templates/ingress.yaml
+++ b/charts/webservice/templates/ingress.yaml
@@ -30,14 +30,14 @@ metadata:
       {{- toYaml $root.Values.ingress.rShinyAnnotations | nindent 4 }}
     {{- end }}
 spec:
-{{- if not $root.Values.auth.enable }}
+{{- if or (eq $container.auth false) (eq $root.Values.auth.enable false) }}
   tls:
   - hosts:
     - {{ required "Must provide ingress host" (tpl (include "webservice.ingressHost" $root) $root) | quote }}
   {{- if (include "webservice.ingressHostAlias" $root) }}
     - {{ tpl (include "webservice.ingressHostAlias" $root) $root | quote }}
   {{- end }}
-    secretName: {{ include "webservice.name" $root }}-cert
+    secretName: {{ include "webservice.name" $root }}-{{ tpl $container.name $root }}-cert
 {{- end }}
   rules:
   - host: {{ tpl (include "webservice.ingressHost" $root) $root | quote }}