From 3673e5ab357c2da7bb7bd067aafbec5d33e817fd Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 14 Mar 2024 13:26:50 -0400 Subject: [PATCH] fixed ingress again --- .../ingresses/templates/_helpers/domain.yaml | 6 ++--- .../ingresses/templates/_helpers/ingress.yaml | 22 +++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/k8s/apps/ingresses/templates/_helpers/domain.yaml b/k8s/apps/ingresses/templates/_helpers/domain.yaml index 5f05cb0..12e5e84 100644 --- a/k8s/apps/ingresses/templates/_helpers/domain.yaml +++ b/k8s/apps/ingresses/templates/_helpers/domain.yaml @@ -1,11 +1,11 @@ {{- define "homelab.ingress.domain" -}} {{- if .useSecondaryDomain -}} - {{- "{{.prefix}}.{{.global.secondaryDomain}}" -}} +{{.prefix}}.{{.global.secondaryDomain}} {{- else -}} {{- if .useDirectPrefix -}} - {{- "{{.prefix}}.{{.global.domain}}" -}} +{{.prefix}}.{{.global.domain}} {{- else -}} - {{- "{{.prefix}}.{{.rootSubDomain}}.{{.global.domain}}" -}} +{{.prefix}}.{{.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 bc638c7..2e82f30 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -2,20 +2,24 @@ # # Input: -# prefix: str -# service: str -# namespace: str -# global: map (should be .global) -# port: int = 80 -# path: str = "/" -# useWildCard: bool = False -# middleware: str = "https-redirect" +# prefix: str = {{ .prefix }} +# service: str = {{ .service }} +# namespace: str = {{ .namespace }} +# global: map (should be .global) = {{ .global | toJson }} +# port: int = 80 = {{ .port }} +# path: str = "/" = {{ .path }} +# useWildCard: bool = False = {{ .useWildCard }} +# middleware: str = "https-redirect" = {{ .middleware }} +# useSecondaryDomain: bool = False = {{ .useSecondaryDomain }} +# useDirectPrefix: bool = False = {{ .useDirectPrefix }} # {{ $domain := (include "homelab.ingress.domain" .) }} {{ $_ := set . "domain" $domain }} +# {{ .domain }} + {{ if .global.tls.enabled }} {{ include "homelab.ingress.domain.tls" . }} {{ end }} @@ -31,7 +35,6 @@ metadata: traefik.ingress.kubernetes.io/router.middlewares: {{ .middleware | default "apps-ingresses-https-redirect"}}@kubernetescrd gethomepage.dev/enabled: "true" gethomepage.dev/name: "{{.prefix}}@{{.namespace}}" - gethomepage.dev/name: "{{.prefix}}@{{.namespace}}" gethomepage.dev/siteMonitor: 'http://{{.service}}.{{ .namespace }}.svc.cluster.local:{{.port | default 80}}{{ .path | default "/" }}{{ .health | default "" }}' # gethomepage.dev/description: {{ .description | default "" }} gethomepage.dev/group: {{ .group | default "Unassigned" }} @@ -61,4 +64,5 @@ spec: hosts: - "{{ $domain }}" {{ end }} + {{- end -}} \ No newline at end of file