diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index 2c15e81..7f8f9f8 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -79,9 +79,13 @@ metadata: traefik.ingress.kubernetes.io/router.middlewares: {{ .middleware | default "apps-ingresses-https-redirect"}}@kubernetescrd gethomepage.dev/enabled: "true" gethomepage.dev/name: "{{.prefix}}@{{.namespace}}" - gethomepage.dev/description: "" - gethomepage.dev/group: "Dynamic" + gethomepage.dev/description: {{ .description | default "" }} + gethomepage.dev/group: {{ .group | default "Unassigned" }} + {{ if .icon }} + gethomepage.dev/icon: "{{.service}}.{{.namespace}}.svc.cluster.local:{{.port | default 80}}{{ .path | default "/" }}{{.icon}}" + {{ else }} gethomepage.dev/icon: "homepage.png" + {{ end }} {{ range $k, $v := (.annotations | default (dict )) }} {{ $k }}: {{ $v }} {{ end }} diff --git a/k8s/apps/ingresses/templates/reverse-proxy.yaml b/k8s/apps/ingresses/templates/reverse-proxy.yaml index f641831..cdbd13b 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 }} -{{- $ingressDef := (dict "service" (printf "reverse-proxy-%s" $prefix) "prefix" $prefix "global" $.Values.global "namespace" $.Release.Namespace ) -}} +{{- $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}} diff --git a/k8s/apps/ingresses/values.yaml b/k8s/apps/ingresses/values.yaml index 582b500..551f30f 100644 --- a/k8s/apps/ingresses/values.yaml +++ b/k8s/apps/ingresses/values.yaml @@ -7,10 +7,13 @@ services: - prefix: "argocd.core" service: "argocd-server" namespace: "argocd" + group: "Core" + icon: "assets/favicon/favicon-32x32.png" - prefix: "demo" service: "dummy-app" namespace: "apps-ingresses" middleware: "apps-ingresses-forwardauth-authentik" + group: "Demo" cloudflare: enabled: false tokenSecretName: ~