fixed ingress again

This commit is contained in:
Ariel Sosnovsky committed 2024-03-14 13:26:50 -04:00
1 parent e95255b810
commit 3673e5ab35
2 files changed
+16 -12

No files matched your search

@@ -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 -}}
@@ -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 -}}