From dfc87cff6ce9a4e4536b616168909a0dddcf9ac6 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 14 Mar 2024 13:42:16 -0400 Subject: [PATCH] rootPrefix support --- k8s/apps/ingresses/templates/_helpers/domain.yaml | 7 ++++--- k8s/apps/ingresses/templates/_helpers/ingress.yaml | 7 +++++++ k8s/apps/ingresses/values-dev.yaml | 11 +++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/k8s/apps/ingresses/templates/_helpers/domain.yaml b/k8s/apps/ingresses/templates/_helpers/domain.yaml index 6b77d91..7d6c0a7 100644 --- a/k8s/apps/ingresses/templates/_helpers/domain.yaml +++ b/k8s/apps/ingresses/templates/_helpers/domain.yaml @@ -1,11 +1,12 @@ {{- define "homelab.ingress.domain" -}} + {{- $rootPrefix := (.leadPrefix | default "") -}} {{- if .useSecondaryDomain -}} -{{.global.secondaryDomain}} +{{$rootPrefix}}{{.global.secondaryDomain}} {{- else -}} {{- if .useDirectPrefix -}} -{{.global.domain}} +{{$rootPrefix}}{{.global.domain}} {{- else -}} -{{.global.rootSubDomain}}.{{.global.domain}} +{{$rootPrefix}}{{.global.rootSubDomain}}.{{.global.domain}} {{- end -}} {{- end -}} {{- end -}} diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index c2abb6f..24c2a7b 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -15,6 +15,13 @@ # +{{ $splitPrefix := splitList "." .prefix }} +{{ $prefix := first $splitPrefix }} +{{ $rootPrefix := join "." (rest $splitPrefix) }} + +{{ $_ := set . "prefix" $prefix }} +{{ $_ := set . "rootPrefix" $rootPrefix }} + {{ $domain := (include "homelab.ingress.domain" .) }} {{ $_ := set . "domain" $domain }} diff --git a/k8s/apps/ingresses/values-dev.yaml b/k8s/apps/ingresses/values-dev.yaml index d5c19ca..c5c25a8 100644 --- a/k8s/apps/ingresses/values-dev.yaml +++ b/k8s/apps/ingresses/values-dev.yaml @@ -5,3 +5,14 @@ reverseProxy: yellow: port: "8123" ip: "192.168.0.23" +services: + - prefix: "argocd.core" + service: "argocd-server" + namespace: "argocd" + group: "Core" + icon: "assets/favicon/favicon-32x32.png" + - prefix: "demo" + service: "dummy-app" + namespace: "apps-ingresses" + middleware: "apps-ingresses-forwardauth-authentik" + group: "Demo" \ No newline at end of file