Merge branch 'stable' of github.com:asosnovsky/homelab into stable
This commit is contained in:
commit
a61271e48c
7 files changed
+79
-17
No files matched your search
@@ -12,26 +12,26 @@
|
||||
# middleware: str = "https-redirect" = {{ .middleware }}
|
||||
# useSecondaryDomain: bool = False = {{ .useSecondaryDomain }}
|
||||
# useDirectPrefix: bool = False = {{ .useDirectPrefix }}
|
||||
# widget: bool = False = {{ .widget | toJson }}
|
||||
#
|
||||
|
||||
|
||||
{{ $splitPrefix := splitList "." .prefix }}
|
||||
{{ $prefix := first $splitPrefix }}
|
||||
{{ $leadPrefix := join "." (rest $splitPrefix) }}
|
||||
{{- $splitPrefix := splitList "." .prefix -}}
|
||||
{{- $prefix := first $splitPrefix -}}
|
||||
{{- $leadPrefix := join "." (rest $splitPrefix) -}}
|
||||
|
||||
{{ $_ := set . "prefix" $prefix }}
|
||||
{{ $_ := set . "leadPrefix" $leadPrefix }}
|
||||
{{- $_ := set . "prefix" $prefix -}}
|
||||
{{- $_ := set . "leadPrefix" $leadPrefix -}}
|
||||
|
||||
{{ $domain := (include "homelab.ingress.domain" .) }}
|
||||
{{- $domain := (include "homelab.ingress.domain" .) -}}
|
||||
|
||||
{{- $_ := set . "domain" $domain -}}
|
||||
|
||||
{{ $_ := set . "domain" $domain }}
|
||||
# .domain = {{ .domain }}
|
||||
# .prefix = {{ .prefix }}
|
||||
|
||||
{{ if .global.tls.enabled }}
|
||||
{{ if .global.tls.enabled }}
|
||||
{{ include "homelab.ingress.domain.tls" . }}
|
||||
{{ end }}
|
||||
|
||||
---
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
@@ -44,13 +44,20 @@ metadata:
|
||||
gethomepage.dev/enabled: "true"
|
||||
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 "" }}
|
||||
{{ if .description}}
|
||||
gethomepage.dev/description: "{{ .description }}"
|
||||
{{ end }}
|
||||
gethomepage.dev/group: {{ .group | default "Unassigned" }}
|
||||
{{ if .icon }}
|
||||
gethomepage.dev/icon: "{{.icon}}"
|
||||
{{ else }}
|
||||
gethomepage.dev/icon: "homepage.png"
|
||||
{{ end }}
|
||||
{{ if .widget }}
|
||||
{{ range $k, $v := .widget }}
|
||||
gethomepage.dev/widget.{{$k}}: {{ $v | quote }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
{{ range $k, $v := (.annotations | default (dict )) }}
|
||||
{{ $k }}: {{ $v }}
|
||||
{{ end }}
|
||||
@@ -72,5 +79,44 @@ spec:
|
||||
hosts:
|
||||
- "{{.prefix}}.{{ $domain }}"
|
||||
{{ end }}
|
||||
|
||||
---
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: "{{.prefix}}.internal"
|
||||
namespace: {{ .namespace }}
|
||||
annotations:
|
||||
homelab-ingress/managing-app-namespace: "apps-ingresses"
|
||||
gethomepage.dev/enabled: "true"
|
||||
gethomepage.dev/name: "{{.prefix}}@{{.namespace}}"
|
||||
gethomepage.dev/siteMonitor: 'http://{{.service}}.{{ .namespace }}.svc.cluster.local:{{.port | default 80}}{{ .path | default "/" }}{{ .health | default "" }}'
|
||||
{{ if .description}}
|
||||
gethomepage.dev/description: "{{ .description }}"
|
||||
{{ end }}
|
||||
gethomepage.dev/group: Internal({{ .group | default "Unassigned" }})
|
||||
{{ if .icon }}
|
||||
gethomepage.dev/icon: "{{.icon}}"
|
||||
{{ else }}
|
||||
gethomepage.dev/icon: "homepage.png"
|
||||
{{ end }}
|
||||
{{ if .widget }}
|
||||
{{- range $k, $v := .widget }}
|
||||
gethomepage.dev/widget.{{$k}}: {{ $v | quote }}
|
||||
{{- end }}
|
||||
{{ end }}
|
||||
{{ range $k, $v := (.annotations | default (dict )) }}
|
||||
{{ $k }}: {{ $v }}
|
||||
{{ end }}
|
||||
spec:
|
||||
rules:
|
||||
- host: "{{.prefix}}.k3sapp.internal"
|
||||
http:
|
||||
paths:
|
||||
- backend:
|
||||
service:
|
||||
name: "{{.service}}"
|
||||
port:
|
||||
number: {{.port | default 80}}
|
||||
path: {{ .path | default "/" }}
|
||||
pathType: Prefix
|
||||
{{- end -}}
|
||||
@@ -22,7 +22,7 @@ spec:
|
||||
protocol: TCP
|
||||
targetPort: {{ $data.port | default 80 }}
|
||||
{{ if (not $data.disableIngress) }}
|
||||
{{- $ingressDef := (dict "service" (printf "reverse-proxy-%s" $prefix) "prefix" $prefix "global" $.Values.global "namespace" $.Release.Namespace "group" "reverse-proxies" ) -}}
|
||||
{{- $ingressDef := (dict "service" (printf "reverse-proxy-%s" $prefix) "prefix" $prefix "global" $.Values.global "namespace" $.Release.Namespace "group" "Reverse Proxies" ) -}}
|
||||
{{- $ingressDef := (merge ($data.overrides | default (dict)) $ingressDef) -}}
|
||||
|
||||
{{ include "homelab.ingress" $ingressDef}}
|
||||
|
||||
@@ -16,6 +16,15 @@ services:
|
||||
namespace: "apps-ingresses"
|
||||
middleware: "apps-ingresses-forwardauth-authentik"
|
||||
group: "Demo"
|
||||
- prefix: "sonarr"
|
||||
service: "sonarr"
|
||||
namespace: "apps-sonarr"
|
||||
group: "Video Hosting"
|
||||
widget:
|
||||
type: sonarr
|
||||
fields: '["wanted", "queued"]'
|
||||
url: http://sonarr.host.or.ip
|
||||
key: apikeyapikeyapikeyapikeyapikey
|
||||
staticFiles:
|
||||
mainDomain: []
|
||||
secondaryDomain:
|
||||
|
||||
@@ -15,6 +15,10 @@ reverseProxy:
|
||||
icon: "https://kuma.home.sosnovsky.ca/apple-touch-icon.png"
|
||||
overrides:
|
||||
middleware: "apps-ingresses-chain-authentik"
|
||||
widget:
|
||||
type: uptimekuma
|
||||
url: http://10.0.12.1:3001
|
||||
slug: main
|
||||
|
||||
basement:
|
||||
ip: "10.0.12.2"
|
||||
@@ -28,6 +32,9 @@ reverseProxy:
|
||||
overrides:
|
||||
middleware: "apps-ingresses-chain-authentik"
|
||||
group: "Video Hosting"
|
||||
widget:
|
||||
type: qbittorrent
|
||||
url: http://10.0.10.3:8080
|
||||
|
||||
esphome:
|
||||
ip: "10.0.10.4"
|
||||
@@ -46,7 +53,6 @@ reverseProxy:
|
||||
port: 8443
|
||||
overrides:
|
||||
group: "Framework Services"
|
||||
overrides:
|
||||
middleware: "apps-ingresses-chain-authentik"
|
||||
|
||||
esphome:
|
||||
@@ -54,7 +60,6 @@ reverseProxy:
|
||||
port: 6052
|
||||
overrides:
|
||||
group: "Framework Services"
|
||||
overrides:
|
||||
middleware: "apps-ingresses-chain-authentik"
|
||||
|
||||
fwdockge:
|
||||
@@ -62,7 +67,6 @@ reverseProxy:
|
||||
port: 5050
|
||||
overrides:
|
||||
group: "Framework Services"
|
||||
overrides:
|
||||
middleware: "apps-ingresses-chain-authentik"
|
||||
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ lab:
|
||||
k3s:
|
||||
- mac: '7C:83:34:B8:7B:43'
|
||||
name: 'bee1'
|
||||
# domain: home.sosnovsky.ca
|
||||
domain: k3sapp.internal
|
||||
- mac: '68:1D:EF:26:B7:6C'
|
||||
name: 'terry1'
|
||||
# domain: home.sosnovsky.ca
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
address=/tnas1.lab.local/10.0.10.1
|
||||
address=/.tnas1.lab.local/10.0.10.1
|
||||
address=/k3sapp.internal/10.0.11.1
|
||||
address=/.k3sapp.internal/10.0.11.1
|
||||
address=/home.sosnovsky.ca/10.0.11.3
|
||||
address=/.home.sosnovsky.ca/10.0.11.3
|
||||
address=/castle.home.sosnovsky.ca/10.0.12.1
|
||||
|
||||
@@ -17,6 +17,7 @@ K3s:
|
||||
Bee1:
|
||||
ip: "10.0.11.1"
|
||||
host: "bee1.k3s.internal"
|
||||
domain: "k3sapp.internal"
|
||||
Terry1:
|
||||
ip: "10.0.11.2"
|
||||
host: "terry1.k3s.internal"
|
||||
|
||||
Reference in new issue
Block a user