do not create htpasswd on the fly in template since the operator goes…

… crazy
kubero-dev · Jan 13, 2025 · 94ec399 · 94ec399
1 parent 163c844
commit 94ec399
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.7-rc.6
+0.1.7-rc.7
diff --git a/helm-charts/kuberoapp/templates/ingress.yaml b/helm-charts/kuberoapp/templates/ingress.yaml
@@ -22,7 +22,7 @@ metadata:
   {{- with .Values.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
-    {{- if gt (len .Values.basicAuth.accounts) 0 }}
+    {{- if .Values.basicAuth.enabled }}
     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 }}

diff --git a/helm-charts/kuberoapp/templates/secret-basic-auth.yaml b/helm-charts/kuberoapp/templates/secret-basic-auth.yaml
@@ -2,8 +2,7 @@
 {{- $accounts := .Values.basicAuth.accounts }}
 {{- $val := "" }}
 {{- range $account := $accounts }}
-{{- $hash := htpasswd $account.user $account.pass }}
-{{- $val = printf "%s%s\n" $val $hash }}
+{{- $val = printf "%s%s\n" $val $account.hash }}
 {{- end }}
 apiVersion: v1
 kind: Secret

diff --git a/helm-charts/kuberoapp/values.yaml b/helm-charts/kuberoapp/values.yaml
@@ -159,12 +159,15 @@ resources: {}
   #   memory: 128Mi
 
 basicAuth:
+  enabled: false
   realm: "Protected"
   accounts: []
     #- user: foo
     #  pass: bar
+    #  hash: ""
     #- user: bar
     #  pass: foo
+    #  hash: ""
 
 autoscaling:
   enabled: false