From dea8f8ea1b948671267a11c29caa91ae110f906a Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 11 Apr 2024 10:46:46 -0400 Subject: [PATCH 01/11] added internal dns --- .../ingresses/templates/_helpers/ingress.yaml | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index db9b2de..505aaac 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -72,5 +72,37 @@ 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" + traefik.ingress.kubernetes.io/router.middlewares: {{ .middleware | default "apps-ingresses-https-redirect"}}@kubernetescrd + 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/group: {{ .group | default "Unassigned" }} + {{ if .icon }} + gethomepage.dev/icon: "{{.icon}}" + {{ else }} + gethomepage.dev/icon: "homepage.png" + {{ end }} + {{ range $k, $v := (.annotations | default (dict )) }} + {{ $k }}: {{ $v }} + {{ end }} +spec: + rules: + - host: "{{.prefix}}.internal" + http: + paths: + - backend: + service: + name: "{{.service}}" + port: + number: {{.port | default 80}} + path: {{ .path | default "/" }} + pathType: Prefix {{- end -}} \ No newline at end of file From 0c631a69f43dc09d76e9bcf0f1e5318afb6f9e0b Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 11 Apr 2024 10:47:33 -0400 Subject: [PATCH 02/11] using k3sapp.intenral --- k8s/apps/ingresses/templates/_helpers/ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index 505aaac..1589d72 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -95,7 +95,7 @@ metadata: {{ end }} spec: rules: - - host: "{{.prefix}}.internal" + - host: "{{.prefix}}.k3sapp.internal" http: paths: - backend: From fc8aa5e92a7a99476d48002fe9413e5cc3831818 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 11 Apr 2024 10:49:39 -0400 Subject: [PATCH 03/11] Updated --- os/routers/glmain/config.yaml | 2 +- os/routers/glmain/output/etc/dnsmasq.conf | 2 ++ os/routers/glmain/output/summary.yaml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 5039499..a403738 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -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 diff --git a/os/routers/glmain/output/etc/dnsmasq.conf b/os/routers/glmain/output/etc/dnsmasq.conf index c80e808..2ea6f44 100644 --- a/os/routers/glmain/output/etc/dnsmasq.conf +++ b/os/routers/glmain/output/etc/dnsmasq.conf @@ -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 diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index e03c8a2..c6ab3d7 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -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" From 014398a581374b025365dc72df71dbbff7c5e2c2 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 11 Apr 2024 11:32:44 -0400 Subject: [PATCH 04/11] disabled middleware for internal resources --- k8s/apps/ingresses/templates/_helpers/ingress.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index 1589d72..f61c3a6 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -80,7 +80,6 @@ metadata: namespace: {{ .namespace }} annotations: homelab-ingress/managing-app-namespace: "apps-ingresses" - traefik.ingress.kubernetes.io/router.middlewares: {{ .middleware | default "apps-ingresses-https-redirect"}}@kubernetescrd 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 "" }}' From d9b8b1f8c679edeab24e3f994e74134bb29e03cd Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 11 Apr 2024 11:42:35 -0400 Subject: [PATCH 05/11] added local group --- k8s/apps/ingresses/templates/_helpers/ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index f61c3a6..45fc32f 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -83,7 +83,7 @@ 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/group: {{ .group | default "Unassigned" }} + gethomepage.dev/group: Local/{{ .group | default "Unassigned" }} {{ if .icon }} gethomepage.dev/icon: "{{.icon}}" {{ else }} From 14c17ffd68c43fc9891b9f06311fb20d5a65954e Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 11 Apr 2024 11:47:51 -0400 Subject: [PATCH 06/11] reverse order --- k8s/apps/ingresses/templates/reverse-proxy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/ingresses/templates/reverse-proxy.yaml b/k8s/apps/ingresses/templates/reverse-proxy.yaml index 8605c72..0d3c963 100644 --- a/k8s/apps/ingresses/templates/reverse-proxy.yaml +++ b/k8s/apps/ingresses/templates/reverse-proxy.yaml @@ -23,7 +23,7 @@ spec: 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 := (merge ($data.overrides | default (dict)) $ingressDef) -}} +{{- $ingressDef := (merge $ingressDef ($data.overrides | default (dict))) -}} {{ include "homelab.ingress" $ingressDef}} From 393ea9ae65241560006f3162384b25ed42a0e263 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 11 Apr 2024 11:48:58 -0400 Subject: [PATCH 07/11] FMService --- k8s/apps/ingresses/values-prod.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/k8s/apps/ingresses/values-prod.yaml b/k8s/apps/ingresses/values-prod.yaml index d558741..4fb3660 100644 --- a/k8s/apps/ingresses/values-prod.yaml +++ b/k8s/apps/ingresses/values-prod.yaml @@ -46,7 +46,6 @@ reverseProxy: port: 8443 overrides: group: "Framework Services" - overrides: middleware: "apps-ingresses-chain-authentik" esphome: @@ -54,7 +53,6 @@ reverseProxy: port: 6052 overrides: group: "Framework Services" - overrides: middleware: "apps-ingresses-chain-authentik" fwdockge: @@ -62,7 +60,6 @@ reverseProxy: port: 5050 overrides: group: "Framework Services" - overrides: middleware: "apps-ingresses-chain-authentik" From 17807b84daea37e1d832db6bdf610ada49d30dab Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 11 Apr 2024 11:50:20 -0400 Subject: [PATCH 08/11] Correct Order --- k8s/apps/ingresses/templates/reverse-proxy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/ingresses/templates/reverse-proxy.yaml b/k8s/apps/ingresses/templates/reverse-proxy.yaml index 0d3c963..8605c72 100644 --- a/k8s/apps/ingresses/templates/reverse-proxy.yaml +++ b/k8s/apps/ingresses/templates/reverse-proxy.yaml @@ -23,7 +23,7 @@ spec: 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 := (merge $ingressDef ($data.overrides | default (dict))) -}} +{{- $ingressDef := (merge ($data.overrides | default (dict)) $ingressDef) -}} {{ include "homelab.ingress" $ingressDef}} From 550bfe19fdbf02cda65079ff0d2c6a82924e6ca1 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 11 Apr 2024 11:50:36 -0400 Subject: [PATCH 09/11] nicer reverse proxy title --- k8s/apps/ingresses/templates/reverse-proxy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/ingresses/templates/reverse-proxy.yaml b/k8s/apps/ingresses/templates/reverse-proxy.yaml index 8605c72..da5dbb0 100644 --- a/k8s/apps/ingresses/templates/reverse-proxy.yaml +++ b/k8s/apps/ingresses/templates/reverse-proxy.yaml @@ -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}} From 6040da7b857ba21590d6ba3fbe7617c921f6b2e0 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 11 Apr 2024 12:06:18 -0400 Subject: [PATCH 10/11] trying widgets --- .../ingresses/templates/_helpers/ingress.yaml | 39 +++++++++++++------ k8s/apps/ingresses/values-dev.yaml | 9 +++++ k8s/apps/ingresses/values-prod.yaml | 3 ++ 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index 45fc32f..d1b85d8 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -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 }} @@ -83,12 +90,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/group: Local/{{ .group | default "Unassigned" }} + {{ 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 }} diff --git a/k8s/apps/ingresses/values-dev.yaml b/k8s/apps/ingresses/values-dev.yaml index ae63219..3d53ce0 100644 --- a/k8s/apps/ingresses/values-dev.yaml +++ b/k8s/apps/ingresses/values-dev.yaml @@ -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: diff --git a/k8s/apps/ingresses/values-prod.yaml b/k8s/apps/ingresses/values-prod.yaml index 4fb3660..96b7e6b 100644 --- a/k8s/apps/ingresses/values-prod.yaml +++ b/k8s/apps/ingresses/values-prod.yaml @@ -28,6 +28,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" From 3891cfac290c6ae5536f62c80cda6723b80df324 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 11 Apr 2024 12:25:19 -0400 Subject: [PATCH 11/11] kuma widget --- k8s/apps/ingresses/values-prod.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/k8s/apps/ingresses/values-prod.yaml b/k8s/apps/ingresses/values-prod.yaml index 96b7e6b..bff73ca 100644 --- a/k8s/apps/ingresses/values-prod.yaml +++ b/k8s/apps/ingresses/values-prod.yaml @@ -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"