From 1968351ef1afeccc3c67c1ed8f403a889401f4ba Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 3 Apr 2023 21:00:33 +0000 Subject: [PATCH] cleaned up ingress --- k8s/infra/authelia/values-prod.yaml | 5 ++--- .../ingresses/templates/_helpers/ingress.yaml | 2 ++ k8s/infra/ingresses/values.yaml | 6 ++---- users_database.yml | 19 +++++++++++++++++++ 4 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 users_database.yml diff --git a/k8s/infra/authelia/values-prod.yaml b/k8s/infra/authelia/values-prod.yaml index e94356c..55aa82c 100644 --- a/k8s/infra/authelia/values-prod.yaml +++ b/k8s/infra/authelia/values-prod.yaml @@ -21,11 +21,10 @@ authelia: ingress: enabled: true certManager: true - className: traefik - subdomain: auth.core + annotations: + traefik.ingress.kubernetes.io/router.middlewares: ingresses-https-redirect@kubernetescrd tls: enabled: true - secret: authelia-tls traefikCRD: enabled: true disableIngressRoute: true diff --git a/k8s/infra/ingresses/templates/_helpers/ingress.yaml b/k8s/infra/ingresses/templates/_helpers/ingress.yaml index b906b1e..31a96fd 100644 --- a/k8s/infra/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/infra/ingresses/templates/_helpers/ingress.yaml @@ -8,6 +8,7 @@ # global: map (should be .global) # port: int = 80 # path: str = "/" +# middleware: str = "https-redirect" # {{ if .global.tls.enabled }} @@ -35,6 +36,7 @@ metadata: namespace: {{ .namespace }} annotations: homelab-ingress/managing-app-namespace: "ingresses" + traefik.ingress.kubernetes.io/router.middlewares: {{ .middleware | default "ingresses-https-redirect"}}@kubernetescrd {{ range $k, $v := (.annotations | default (dict )) }} {{ $k }}: {{ $v }} {{ end }} diff --git a/k8s/infra/ingresses/values.yaml b/k8s/infra/ingresses/values.yaml index 42b0a6e..c126399 100644 --- a/k8s/infra/ingresses/values.yaml +++ b/k8s/infra/ingresses/values.yaml @@ -6,14 +6,12 @@ services: - prefix: "demo" service: "dummy-app" namespace: "ingresses" - annotations: - traefik.ingress.kubernetes.io/router.middlewares: ingresses-forwardauth-authentik@kubernetescrd + middleware: "ingresses-forwardauth-authelia" - prefix: "nextcloud" service: "nextcloud" namespace: "app-nextcloud" port: 8080 - annotations: - traefik.ingress.kubernetes.io/router.middlewares: app-nextcloud-nextcloud@kubernetescrd + middleware: "app-nextcloud-nextcloud" - prefix: "authentik.core" service: "authentik" namespace: "authentik" diff --git a/users_database.yml b/users_database.yml new file mode 100644 index 0000000..e3283bd --- /dev/null +++ b/users_database.yml @@ -0,0 +1,19 @@ +# yamllint disable rule:line-length +--- +############################################################### +# Users Database # +############################################################### + +# This file can be used if you do not have an LDAP set up. + +users: + authelia: + disabled: false + displayname: "Test User" + password: "$argon2id$v=19$m=32768,t=1,p=8$eUhVT1dQa082YVk2VUhDMQ$E8QI4jHbUBt3EdsU1NFDu4Bq5jObKNx7nBKSn1EYQxk" # Password is 'authelia' + email: ariel@sosnovsky.ca + groups: + - admins + - dev +... +# yamllint enable rule:line-length