Enable customizing for basic auth gateway (#6)

Co-authored-by: Victor Getz <sd>
iits-consulting · May 8, 2023 · e9427ce · e9427ce
1 parent 9a9872c
commit e9427ce
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/charts/basic-auth-gateway/Chart.yaml b/charts/basic-auth-gateway/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 description: basic auth gateway chart for traefik
 name: basic-auth-gateway
-version: 0.2.5
+version: 0.3.0
diff --git a/charts/basic-auth-gateway/security/users b/charts/basic-auth-gateway/security/users
diff --git a/...ic-auth-gateway/templates/basic-auth.yaml → ...eway/templates/basic-auth-middleware.yaml b/...ic-auth-gateway/templates/basic-auth.yaml → ...eway/templates/basic-auth-middleware.yaml
@@ -5,4 +5,4 @@ metadata:
 spec:
   basicAuth:
     secret: admin-secret
-    headerField: X-WebAuth-User
+    headerField: X-WebAuth-User
diff --git a/charts/basic-auth-gateway/templates/basic-auth-secret.yaml b/charts/basic-auth-gateway/templates/basic-auth-secret.yaml
@@ -4,4 +4,4 @@ metadata:
   name: admin-secret
 data:
   users: |2
-    {{ printf "security/users" | .Files.Get | trim | b64enc }}
+    {{.Values.credentials  | trim | b64enc }}
diff --git a/charts/basic-auth-gateway/templates/route.yaml b/charts/basic-auth-gateway/templates/route.yaml
@@ -11,8 +11,8 @@ spec:
       middlewares:
         - name: basic-auth-gateway
       services:
-        - name: {{ .Values.upstream.service.name }}
-          port: {{ .Values.upstream.service.port }}
+        - name: {{ .Values.ingressRoute.upstream.service.name }}
+          port: {{ .Values.ingressRoute.upstream.service.port }}
   tls:
     secretName: {{.Values.ingressRoute.certificate.name}}
     domains:

diff --git a/charts/basic-auth-gateway/values.yaml b/charts/basic-auth-gateway/values.yaml
@@ -1,9 +1,11 @@
-upstream:
-  service:
-    name: traefik-websecure-internal
-    port: 8444
-
+#https://doc.traefik.io/traefik/middlewares/http/basicauth/
+credentials: |-
+  admin:$2y$05$4F7SwJRC6SL.uu0DUr1cjO.IOnY3uVb12MWTi/YG/TVsFulTRk4qe
 ingressRoute:
+  upstream:
+    service:
+      name: traefik-websecure-internal
+      port: 8444
   adminDomain: "admin.my-domain.com"
   entryPointName: "websecure"
   certificate: