(chore) Tidying up homepage settings and ingress annotations

aisling136 · Apr 27, 2024 · 4fe0f6f · 4fe0f6f
1 parent 0a166e1
commit 4fe0f6f
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 39 deletions.
diff --git a/cluster/apps/homepage/configmap.yaml b/cluster/apps/homepage/configmap.yaml
@@ -21,21 +21,21 @@ data:
       - Homelab:
         - href: 'https://github.com/dexter136/HomeLab'
           icon: github.svg
-    - Media:
-      - Plex:
-        - href: 'http://plex.aisling.dev'
-          icon: plex.svg
+  docker.yaml: ""
+  kubernetes.yaml: |
+    mode: cluster
+  services.yaml: |
     - System:
       - NAS:
-        - href: 'https://nas.aisling.dev'
+          href: 'https://nas.aisling.dev'
           icon: synology.svg
       - PiHole:
-        - href: 'http://192.168.1.8:8080/admin'
+          href: 'http://192.168.1.8:8080/admin'
           icon: pi-hole.svg
-  docker.yaml: ""
-  kubernetes.yaml: |
-    mode: cluster
-  services.yaml: ""
+    - Media:
+      - Plex:
+          href: 'http://plex.aisling.dev'
+          icon: plex.svg
   settings.yaml: |
     title: Dashboard
     favicon: https://raw.githubusercontent.com/dexter136/homelab/main/.icons/aisling.png
@@ -53,20 +53,16 @@ data:
       hideVisitURL: true
     layout:
       Media:
-        style: row
-        columns: 3
+        style: column
         icon: mdi-download-circle
       Monitoring:
-        style: row
-        columns: 5
+        style: column
         icon: mdi-chart-line
       System:
-        style: row
-        columns: 5
+        style: column
         icon: mdi-server
       Documentation:
-        style: row
-        columns: 3
+        style: column
         icon: mdi-download-circle
   widgets.yaml: |
     - search:
@@ -82,7 +78,7 @@ data:
         nodes:
           cpu: true
           memory: true
-          show: false
+          show: true
           showLabel: true
     - datetime:
         text_size: l

diff --git a/cluster/apps/homepage/helmvalues.yaml b/cluster/apps/homepage/helmvalues.yaml
@@ -26,6 +26,10 @@ service:
 ingress:
   app:
     className: internal
+    annotations:
+      nginx.ingress.kubernetes.io/affinity: "cookie"
+      nginx.ingress.kubernetes.io/session-cookie-name: "homepagesession"
+      nginx.ingress.kubernetes.io/session-cookie-max-age: "172800"
     hosts:
       - host: &host home.dex136.xyz
         paths:

diff --git a/cluster/apps/homepage/rbac.yaml b/cluster/apps/homepage/rbac.yaml
@@ -24,13 +24,6 @@ rules:
     verbs:
       - get
       - list
-  - apiGroups:
-      - traefik.containo.us
-    resources:
-      - ingressroutes
-    verbs:
-      - get
-      - list
   - apiGroups:
       - metrics.k8s.io
     resources:

diff --git a/cluster/apps/statuspage/deployment.yaml b/cluster/apps/statuspage/deployment.yaml
@@ -50,7 +50,10 @@ metadata:
     gethomepage.dev/icon: mdi-bottle-tonic-plus
     gethomepage.dev/group: Monitoring
     gethomepage.dev/name: "ArgoStatus"
-    gethomepage.dev/pod-selector: ""
+    gethomepage.dev/pod-selector: >-
+        app in (
+          statuspage
+        )
     external-dns.alpha.kubernetes.io/target: external.dex136.xyz
   name: statuspage
 spec:

diff --git a/cluster/bootstrap/argocd/helmvalues.yaml b/cluster/bootstrap/argocd/helmvalues.yaml
@@ -41,7 +41,6 @@ server:
       gethomepage.dev/icon: argocd.svg
       gethomepage.dev/name: "ArgoCD"
       gethomepage.dev/group: "System"
-      gethomepage.dev/pod-selector: ""
     tls: true
   metrics: &metrics
     enabled: true

diff --git a/cluster/cluster-software/longhorn/helmvalues.yaml b/cluster/cluster-software/longhorn/helmvalues.yaml
@@ -10,7 +10,10 @@ ingress:
     gethomepage.dev/icon: longhorn.svg
     gethomepage.dev/name: "Longhorn"
     gethomepage.dev/group: "System"
-    gethomepage.dev/pod-selector: ""
+    gethomepage.dev/pod-selector: >-
+        app.kubernetes.io/instance in (
+            longhorn
+        )
 metrics:
   serviceMonitor:
     enabled: true

diff --git a/cluster/media/overseerr/helmvalues.yaml b/cluster/media/overseerr/helmvalues.yaml
@@ -67,7 +67,10 @@ ingress:
       gethomepage.dev/name: "Overseerr"
       gethomepage.dev/icon: overseerr.svg
       gethomepage.dev/group: Media
-      gethomepage.dev/pod-selector: ""
+      gethomepage.dev/pod-selector: >-
+        app.kubernetes.io/instance in (
+            overseerr
+        )
     hosts:
       - host: &host requests.dex136.xyz
         paths:

diff --git a/cluster/media/prowlarr/helmvalues.yaml b/cluster/media/prowlarr/helmvalues.yaml
@@ -67,7 +67,6 @@ ingress:
       gethomepage.dev/name: "Prowlarr"
       gethomepage.dev/icon: prowlarr.svg
       gethomepage.dev/group: Media
-      gethomepage.dev/pod-selector: ""
     hosts:
       - host: &host "prowlarr.dex136.xyz"
         paths:

diff --git a/cluster/media/qbittorrent/helmvalues.yaml b/cluster/media/qbittorrent/helmvalues.yaml
@@ -77,7 +77,6 @@ ingress:
       gethomepage.dev/name: "Qbittorrent"
       gethomepage.dev/icon: qbittorrent.svg
       gethomepage.dev/group: Media
-      gethomepage.dev/pod-selector: ""
     hosts:
       - host: &host qb.dex136.xyz
         paths:

diff --git a/cluster/media/radarr/helmvalues.yaml b/cluster/media/radarr/helmvalues.yaml
@@ -69,7 +69,6 @@ ingress:
       gethomepage.dev/name: "Radarr"
       gethomepage.dev/icon: radarr.svg
       gethomepage.dev/group: Media
-      gethomepage.dev/pod-selector: ""
     hosts:
       - host: &host "radarr.dex136.xyz"
         paths:

diff --git a/cluster/media/sonarr/helmvalues.yaml b/cluster/media/sonarr/helmvalues.yaml
@@ -69,7 +69,6 @@ ingress:
       gethomepage.dev/name: "Sonarr"
       gethomepage.dev/icon: sonarr.svg
       gethomepage.dev/group: Media
-      gethomepage.dev/pod-selector: ""
     hosts:
       - host: &host "sonarr.dex136.xyz"
         paths:

diff --git a/cluster/media/tautulli/helmvalues.yaml b/cluster/media/tautulli/helmvalues.yaml
@@ -57,7 +57,6 @@ ingress:
       gethomepage.dev/name: "Tautulli"
       gethomepage.dev/icon: tautulli.svg
       gethomepage.dev/group: Media
-      gethomepage.dev/pod-selector: ""
     hosts:
       - host: &host tautulli.dex136.xyz
         paths:

diff --git a/cluster/monitoring/grafana/helmvalues.yaml b/cluster/monitoring/grafana/helmvalues.yaml
@@ -203,7 +203,6 @@ ingress:
       gethomepage.dev/icon: grafana.svg
       gethomepage.dev/name: "Grafana"
       gethomepage.dev/group: Monitoring
-      gethomepage.dev/pod-selector: ""
   hosts:
     - &host grafana.dex136.xyz
   tls:

diff --git a/cluster/monitoring/kube-prometheus-stack/helmvalues.yaml b/cluster/monitoring/kube-prometheus-stack/helmvalues.yaml
@@ -74,7 +74,11 @@ prometheus:
       gethomepage.dev/icon: prometheus.svg
       gethomepage.dev/name: "Prometheus"
       gethomepage.dev/group: Monitoring
-      gethomepage.dev/pod-selector: ""
+      gethomepage.dev/pod-selector: >-
+        app.kubernetes.io/component in (
+            prometheus-operator,
+            metrics
+        )
     hosts:
       - &host prometheus.dex136.xyz
     tls:
@@ -110,7 +114,10 @@ alertmanager:
       gethomepage.dev/icon: alertmanager.svg
       gethomepage.dev/name: "Alert Manager"
       gethomepage.dev/group: Monitoring
-      gethomepage.dev/pod-selector: ""
+      gethomepage.dev/pod-selector: >-
+        app.kubernetes.io/name in (
+            alertmanager
+        )
     hosts:
       - &host alertmanager.dex136.xyz
     tls:

diff --git a/cluster/monitoring/uptime-kuma/helmvalues.yaml b/cluster/monitoring/uptime-kuma/helmvalues.yaml
@@ -34,7 +34,6 @@ ingress:
       gethomepage.dev/icon: uptime-kuma.svg
       gethomepage.dev/name: "Uptime Kuma"
       gethomepage.dev/group: Monitoring
-      gethomepage.dev/pod-selector: ""
       external-dns.alpha.kubernetes.io/target: "external.dex136.xyz"
       nginx.ingress.kubernetes.io/configuration-snippet: |
           proxy_set_header Accept-Encoding "";