Attempt ingress fix #3
This commit is contained in:
1 parent
3673e5ab35
commit
e345785faf
3 files changed
+15
-16
No files matched your search
@@ -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 -}}
|
||||
@@ -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 }}
|
||||
@@ -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 -}}
|
||||
Reference in new issue
Block a user