From 9d43584780cbd91ee056b1f38fad85f19087ba96 Mon Sep 17 00:00:00 2001 From: Steven Kreitzer Date: Fri, 12 Jan 2024 15:26:35 -0600 Subject: [PATCH] chore(hajimari): flip some settings --- .../weave-gitops/app/helmrelease.yaml | 2 +- .../apps/home/hajimari/app/helmrelease.yaml | 29 +++++++------------ .../home/home-assistant/app/helmrelease.yaml | 1 + .../apps/home/node-red/app/helmrelease.yaml | 1 + .../home/zigbee2mqtt/app/helmrelease.yaml | 1 + .../kube-system/cilium/app/helmrelease.yaml | 2 +- .../media/qbittorrent/app/helmrelease.yaml | 1 + .../apps/media/sabnzbd/app/helmrelease.yaml | 1 + .../monitoring/gatus/app/helmrelease.yaml | 3 +- .../monitoring/karma/app/helmrelease.yaml | 2 +- .../security/authelia/app/helmrelease.yaml | 1 + 11 files changed, 21 insertions(+), 23 deletions(-) diff --git a/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml b/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml index 18c4100505..2e417ec3eb 100644 --- a/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml +++ b/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml @@ -31,7 +31,7 @@ spec: enabled: true className: internal annotations: - hajimari.io/icon: mdi:sawtooth-wave + hajimari.io/icon: simple-icons:flux hosts: - host: &host gitops.${PUBLIC_DOMAIN} paths: diff --git a/kubernetes/apps/home/hajimari/app/helmrelease.yaml b/kubernetes/apps/home/hajimari/app/helmrelease.yaml index 29f12832a8..a922c1666d 100644 --- a/kubernetes/apps/home/hajimari/app/helmrelease.yaml +++ b/kubernetes/apps/home/hajimari/app/helmrelease.yaml @@ -27,10 +27,10 @@ spec: TZ: ${TIMEZONE} hajimari: title: Apps - lightTheme: cloud - darkTheme: espresso + lightTheme: paper + darkTheme: chalk alwaysTargetBlank: true - showGreeting: false + showGreeting: true showAppGroups: false showAppStatus: false showBookmarkGroups: false @@ -38,16 +38,7 @@ spec: showAppUrls: true defaultEnable: true namespaceSelector: - matchNames: - - default - - flux-system - - home - - kube-system - - media - - monitoring - - networking - - rook-ceph - - security + any: true ingress: main: enabled: true @@ -55,19 +46,19 @@ spec: annotations: hajimari.io/enable: "false" hosts: - - host: &host0 ${PUBLIC_DOMAIN} + - host: &host "{{ .Release.Name }}.${PUBLIC_DOMAIN}" paths: &paths - path: / pathType: Prefix - - host: &host1 www.${PUBLIC_DOMAIN} + - host: &customHost0 www.${PUBLIC_DOMAIN} paths: *paths - - host: &host2 apps.${PUBLIC_DOMAIN} + - host: &customHost1 ${PUBLIC_DOMAIN} paths: *paths tls: - hosts: - - *host0 - - *host1 - - *host2 + - *host + - *customHost0 + - *customHost1 podAnnotations: configmap.reloader.stakater.com/reload: hajimari-settings persistence: diff --git a/kubernetes/apps/home/home-assistant/app/helmrelease.yaml b/kubernetes/apps/home/home-assistant/app/helmrelease.yaml index 81a5499a86..1564e1293a 100644 --- a/kubernetes/apps/home/home-assistant/app/helmrelease.yaml +++ b/kubernetes/apps/home/home-assistant/app/helmrelease.yaml @@ -86,6 +86,7 @@ spec: className: internal annotations: hajimari.io/icon: mdi:home-assistant + hajimari.io/url: https://hass.${PUBLIC_DOMAIN} hosts: - host: &host "{{ .Release.Name }}.${PUBLIC_DOMAIN}" paths: &paths diff --git a/kubernetes/apps/home/node-red/app/helmrelease.yaml b/kubernetes/apps/home/node-red/app/helmrelease.yaml index a4baf1bfd6..99a36976cc 100644 --- a/kubernetes/apps/home/node-red/app/helmrelease.yaml +++ b/kubernetes/apps/home/node-red/app/helmrelease.yaml @@ -67,6 +67,7 @@ spec: className: internal annotations: hajimari.io/icon: cib:node-red + hajimari.io/url: https://nr.${PUBLIC_DOMAIN} hosts: - host: &host "{{ .Release.Name }}.${PUBLIC_DOMAIN}" paths: &paths diff --git a/kubernetes/apps/home/zigbee2mqtt/app/helmrelease.yaml b/kubernetes/apps/home/zigbee2mqtt/app/helmrelease.yaml index 667364ae00..410345870f 100644 --- a/kubernetes/apps/home/zigbee2mqtt/app/helmrelease.yaml +++ b/kubernetes/apps/home/zigbee2mqtt/app/helmrelease.yaml @@ -96,6 +96,7 @@ spec: className: internal annotations: hajimari.io/icon: mdi:zigbee + hajimari.io/url: https://zigbee.${PUBLIC_DOMAIN} hosts: - host: &host "{{ .Release.Name }}.${PUBLIC_DOMAIN}" paths: &paths diff --git a/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml b/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml index fdadda84d4..4ca8a6f73f 100644 --- a/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml +++ b/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml @@ -80,7 +80,7 @@ spec: enabled: true className: internal annotations: - hajimari.io/icon: mdi:router + hajimari.io/icon: simple-icons:cilium hosts: - &host hubble.${PUBLIC_DOMAIN} tls: diff --git a/kubernetes/apps/media/qbittorrent/app/helmrelease.yaml b/kubernetes/apps/media/qbittorrent/app/helmrelease.yaml index b4087ecce4..245ebb9527 100644 --- a/kubernetes/apps/media/qbittorrent/app/helmrelease.yaml +++ b/kubernetes/apps/media/qbittorrent/app/helmrelease.yaml @@ -118,6 +118,7 @@ spec: className: internal annotations: hajimari.io/icon: mdi:seedling + hajimari.io/url: https://qb.${PUBLIC_DOMAIN} hosts: - host: &host "{{ .Release.Name }}.${PUBLIC_DOMAIN}" paths: &paths diff --git a/kubernetes/apps/media/sabnzbd/app/helmrelease.yaml b/kubernetes/apps/media/sabnzbd/app/helmrelease.yaml index c6c55b1efc..018eefe7b5 100644 --- a/kubernetes/apps/media/sabnzbd/app/helmrelease.yaml +++ b/kubernetes/apps/media/sabnzbd/app/helmrelease.yaml @@ -98,6 +98,7 @@ spec: className: internal annotations: hajimari.io/icon: mdi:download + hajimari.io/url: https://sab.${PUBLIC_DOMAIN} hosts: - host: &host "{{ .Release.Name }}.${PUBLIC_DOMAIN}" paths: &paths diff --git a/kubernetes/apps/monitoring/gatus/app/helmrelease.yaml b/kubernetes/apps/monitoring/gatus/app/helmrelease.yaml index fd17109e75..3262df0b15 100644 --- a/kubernetes/apps/monitoring/gatus/app/helmrelease.yaml +++ b/kubernetes/apps/monitoring/gatus/app/helmrelease.yaml @@ -110,7 +110,8 @@ spec: className: external annotations: gatus.io/enabled: "true" - hajimari.io/icon: material-symbols:detector-status + hajimari.io/icon: simple-icons:statuspage + hajimari.io/url: https://status.${PUBLIC_DOMAIN} external-dns.alpha.kubernetes.io/target: external.${PUBLIC_DOMAIN} hosts: - host: &host "{{ .Release.Name }}.${PUBLIC_DOMAIN}" diff --git a/kubernetes/apps/monitoring/karma/app/helmrelease.yaml b/kubernetes/apps/monitoring/karma/app/helmrelease.yaml index 61a6d5c8e4..d4c1f296aa 100644 --- a/kubernetes/apps/monitoring/karma/app/helmrelease.yaml +++ b/kubernetes/apps/monitoring/karma/app/helmrelease.yaml @@ -78,7 +78,7 @@ spec: enabled: true className: internal annotations: - hajimari.io/icon: mdi:alert + hajimari.io/icon: mdi:recycle hosts: - host: &host "{{ .Release.Name }}.${PUBLIC_DOMAIN}" paths: diff --git a/kubernetes/apps/security/authelia/app/helmrelease.yaml b/kubernetes/apps/security/authelia/app/helmrelease.yaml index 54734f69d5..8fe834dd16 100644 --- a/kubernetes/apps/security/authelia/app/helmrelease.yaml +++ b/kubernetes/apps/security/authelia/app/helmrelease.yaml @@ -82,6 +82,7 @@ spec: className: external annotations: gatus.io/enabled: "true" + hajimari.io/url: https://auth.${PUBLIC_DOMAIN} hajimari.io/icon: mdi:shield-account nginx.ingress.kubernetes.io/configuration-snippet: | add_header Cache-Control "no-store";