From 9963a0c5ed41e035136682d1569309a23bb9e302 Mon Sep 17 00:00:00 2001
From: Gianni Carafa <gianni.carafa@srf.ch>
Date: Fri, 10 Jan 2025 22:06:46 +0100
Subject: [PATCH] fix basic auth ingress

---
 VERSION                                      | 2 +-
 helm-charts/kuberoapp/templates/ingress.yaml | 4 ++--
 helm-charts/kuberoapp/values.yaml            | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/VERSION b/VERSION
index 9ad31fa..b4be933 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.7-rc3
+0.1.7-rc.5
diff --git a/helm-charts/kuberoapp/templates/ingress.yaml b/helm-charts/kuberoapp/templates/ingress.yaml
index e3c359c..5b75857 100644
--- a/helm-charts/kuberoapp/templates/ingress.yaml
+++ b/helm-charts/kuberoapp/templates/ingress.yaml
@@ -18,15 +18,15 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "kuberoapp.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
   annotations:
+  {{- with .Values.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
+  {{- end }}
     {{- if gt (len .Values.basicAuth.accounts) 0 }}
     nginx.ingress.kubernetes.io/auth-secret: {{ include "kuberoapp.fullname" . }}-htpasswd
     nginx.ingress.kubernetes.io/auth-type: basic
     nginx.ingress.kubernetes.io/auth-realm: {{ .Values.basicAuth.realm | quote }}
     {{- end }}
-  {{- end }}
 spec:
   {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
   ingressClassName: {{ .Values.ingress.className }}
diff --git a/helm-charts/kuberoapp/values.yaml b/helm-charts/kuberoapp/values.yaml
index 0867515..66b73c2 100644
--- a/helm-charts/kuberoapp/values.yaml
+++ b/helm-charts/kuberoapp/values.yaml
@@ -160,9 +160,9 @@ resources: {}
 
 basicAuth:
   realm: "Protected"
-  accounts: []
-    #- user: foo
-    #  password: bar
+  accounts:
+    - user: foo
+      password: bar
     #- user: bar
     #  password: foo