From e345785fafd273828ff692f7e932ba58d323c342 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 14 Mar 2024 13:31:41 -0400 Subject: [PATCH] Attempt ingress fix #3 --- k8s/apps/ingresses/templates/_helpers/domain.yaml | 6 +++--- .../ingresses/templates/_helpers/ingress.tls.yaml | 10 +++++----- .../ingresses/templates/_helpers/ingress.yaml | 15 +++++++-------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/k8s/apps/ingresses/templates/_helpers/domain.yaml b/k8s/apps/ingresses/templates/_helpers/domain.yaml index 12e5e84..6b77d91 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}} +{{.global.secondaryDomain}} {{- else -}} {{- if .useDirectPrefix -}} -{{.prefix}}.{{.global.domain}} +{{.global.domain}} {{- else -}} -{{.prefix}}.{{.global.rootSubDomain}}.{{.global.domain}} +{{.global.rootSubDomain}}.{{.global.domain}} {{- end -}} {{- end -}} {{- end -}} diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.tls.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.tls.yaml index 24eb608..449b649 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.tls.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.tls.yaml @@ -4,7 +4,7 @@ apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret metadata: - name: "tls-{{ .domain }}" + name: "tls-{{.prefix}}.{{ .domain }}" namespace: {{ .namespace }} spec: refreshInterval: 1h @@ -29,15 +29,15 @@ spec: apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: "tls-{{ .domain }}" + name: "tls-{{.prefix}}.{{ .domain }}" namespace: {{ .namespace }} spec: - secretName: "tls-{{ .domain }}" + secretName: "tls-{{.prefix}}.{{ .domain }}" issuerRef: kind: ClusterIssuer name: "{{ .global.tls.issuer }}" - commonName: "{{ .domain }}" + commonName: "{{.prefix}}.{{ .domain }}" dnsNames: - - "{{ .domain }}" + - "{{.prefix}}.{{ .domain }}" {{ end }} {{ end }} \ No newline at end of file diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index 2e82f30..c2abb6f 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -1,7 +1,7 @@ {{- define "homelab.ingress" }} # -# Input: +# Input: = {{ . | toJson }} # prefix: str = {{ .prefix }} # service: str = {{ .service }} # namespace: str = {{ .namespace }} @@ -12,14 +12,13 @@ # 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 }} @@ -28,7 +27,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: "{{ $domain }}" + name: "{{.prefix}}.{{ $domain }}" namespace: {{ .namespace }} annotations: homelab-ingress/managing-app-namespace: "apps-ingresses" @@ -48,7 +47,7 @@ metadata: {{ end }} spec: rules: - - host: "{{ $domain }}" + - host: "{{.prefix}}.{{ $domain }}" http: paths: - backend: @@ -60,9 +59,9 @@ spec: pathType: Prefix {{ if .global.tls.enabled }} tls: - - secretName: "tls-{{ $domain }}" + - secretName: "tls-{{.prefix}}.{{ $domain }}" hosts: - - "{{ $domain }}" + - "{{.prefix}}.{{ $domain }}" {{ end }} {{- end -}} \ No newline at end of file