From b575180eedc4b0d33d6ec080e573e25c326bbd97 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 17 Jul 2024 18:18:51 -0400 Subject: [PATCH] authentik.{{ .Values.global.rootSubDomain }}y --- k8s/apps/ingresses/templates/authentik.yaml | 14 +++++++------- k8s/argoapps/apps-values/ingresses.yaml | 2 +- k8s/argoapps/chart-values/authentik.yaml | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/k8s/apps/ingresses/templates/authentik.yaml b/k8s/apps/ingresses/templates/authentik.yaml index e6406e5..9d090f1 100644 --- a/k8s/apps/ingresses/templates/authentik.yaml +++ b/k8s/apps/ingresses/templates/authentik.yaml @@ -2,12 +2,12 @@ apiVersion: traefik.containo.us/v1alpha1 kind: IngressRoute metadata: - name: authentik.core.home.{{ .Values.global.domain }} + name: authentik.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }} namespace: chart-authentik spec: routes: - kind: Rule - match: "Host(`authentik.core.home.{{ .Values.global.domain }}`)" + match: "Host(`authentik.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}`)" middlewares: - name: forwardauth-authentik namespace: chart-authentik @@ -18,7 +18,7 @@ spec: namespace: chart-authentik port: 80 - kind: Rule - match: "Host(`authentik.core.home.{{ .Values.global.domain }}`) && PathPrefix(`/outpost.goauthentik.io/`)" + match: "Host(`authentik.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}`) && PathPrefix(`/outpost.goauthentik.io/`)" priority: 15 services: - kind: Service @@ -27,9 +27,9 @@ spec: port: 80 {{ if .Values.global.tls.enabled }} tls: - secretName: tls-authentik.core.home.{{ .Values.global.domain }} + secretName: tls-authentik.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }} domains: - - main: authentik.core.home.{{ .Values.global.domain }} + - main: authentik.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }} {{ end }} --- apiVersion: traefik.containo.us/v1alpha1 @@ -39,7 +39,7 @@ metadata: namespace: chart-authentik spec: forwardAuth: - address: http://authentik.core.home.{{ .Values.global.domain }}/outpost.goauthentik.io/auth/traefik + address: http://authentik.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}/outpost.goauthentik.io/auth/traefik trustForwardHeader: true authResponseHeaders: - X-authentik-username @@ -55,7 +55,7 @@ spec: - X-authentik-meta-version --- {{ if .Values.global.tls.enabled }} -{{ include "homelab.ingress.domain.tls" (dict "global" .Values.global "namespace" "chart-authentik" "prefix" "authentik.core.home" "domain" .Values.global.domain ) }} +{{ include "homelab.ingress.domain.tls" (dict "global" .Values.global "namespace" "chart-authentik" "prefix" "authentik.{{ .Values.global.rootSubDomain }}" "domain" .Values.global.domain ) }} --- apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index 100c4e6..25b0229 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -35,7 +35,7 @@ services: # service: "authentik-server" # namespace: "chart-authentik" # group: "Core" - # icon: "https://authentik.core.home.sosnovsky.ca/static/dist/assets/icons/icon.png" + # icon: "https://authentik.home.sosnovsky.ca/static/dist/assets/icons/icon.png" # root services - prefix: "demo" service: "dummy-app" diff --git a/k8s/argoapps/chart-values/authentik.yaml b/k8s/argoapps/chart-values/authentik.yaml index 027a28e..dd9f2af 100644 --- a/k8s/argoapps/chart-values/authentik.yaml +++ b/k8s/argoapps/chart-values/authentik.yaml @@ -1,5 +1,5 @@ authentik: - cookie_domain: authentik.core.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }} + cookie_domain: {{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }} email: from: {{ .Values.global.smtp.email }} host: postfix.email.svc.cluster.local @@ -20,16 +20,16 @@ server: annotations: gethomepage.dev/enabled: 'true' gethomepage.dev/group: Core - gethomepage.dev/icon: 'https://authentik.core.home.{{ .Values.global.domain }}/static/dist/assets/icons/icon.png' + gethomepage.dev/icon: 'https://authentik.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }}/static/dist/assets/icons/icon.png' gethomepage.dev/name: authentik@chart-authentik gethomepage.dev/siteMonitor: 'http://authentik-server.chart-authentik.svc.cluster.local:80/' hosts: - - authentik.core.home.{{ .Values.global.domain }} + - authentik.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }} pathType: Prefix tls: - hosts: - - authentik.core.home.{{ .Values.global.domain }} - secretName: tls-authentik.core.home.{{ .Values.global.domain }} + - authentik.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }} + secretName: tls-authentik.{{ .Values.global.rootSubDomain }}.{{ .Values.global.domain }} https: false global: envFrom: