From 6040da7b857ba21590d6ba3fbe7617c921f6b2e0 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 11 Apr 2024 12:06:18 -0400 Subject: [PATCH] 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"