refactor

2025-09-17 18:24:14 +02:00 · 2025-06-21 23:41:55 +02:00
parent 8b760eab07
commit 82985130e0
60 changed files with 39 additions and 142 deletions
--- a/kubernetes/apps/database/crunchy-postgres-operator/pgadmin/ingress.yaml
+++ b/kubernetes/apps/database/crunchy-postgres-operator/pgadmin/ingress.yaml
@@ -5,16 +5,15 @@ kind: Ingress
 metadata:
  name: pgadmin
  annotations:
-          hajimari.io/icon: mdi:database
-          gethomepage.dev/enabled: "true"
-          gethomepage.dev/name: pgAdmin
-          gethomepage.dev/description: PostgreSQL management tool.
-          gethomepage.dev/group: Infrrastructure
-          gethomepage.dev/icon: pgadmin.png
-          gethomepage.dev/pod-selector: >-
-            app in (
-              pgadmin
-            )
+    gethomepage.dev/enabled: "true"
+    gethomepage.dev/name: pgAdmin
+    gethomepage.dev/description: PostgreSQL management tool.
+    gethomepage.dev/group: Infrrastructure
+    gethomepage.dev/icon: pgadmin.png
+    gethomepage.dev/pod-selector: >-
+      app in (
+        pgadmin
+      )
 spec:
  ingressClassName: internal
  tls:
--- a/kubernetes/apps/default/atuin/app/helmrelease.yaml
+++ b/kubernetes/apps/default/atuin/app/helmrelease.yaml
@@ -82,8 +82,6 @@ spec:
      app:
        enabled: true
        className: internal
-        annotations:
-          hajimari.io/icon: mdi:powershell
        hosts:
          - host: &host "sh.${SECRET_EXTERNAL_DOMAIN}"
            paths:
--- a/kubernetes/apps/default/authelia/app/helmrelease.yaml
+++ b/kubernetes/apps/default/authelia/app/helmrelease.yaml
@@ -104,7 +104,6 @@ spec:
            add_header Pragma "no-cache";
            add_header X-Frame-Options "SAMEORIGIN";
            add_header X-XSS-Protection "1; mode=block";
-          hajimari.io/icon: mdi:shield-account
          gethomepage.dev/enabled: "true"
          gethomepage.dev/group: Infrastructure
          gethomepage.dev/name: Authelia
--- a/kubernetes/apps/default/bazarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/bazarr/app/helmrelease.yaml
@@ -96,7 +96,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:subtitles-outline
          gethomepage.dev/enabled: "true"
          gethomepage.dev/group: Media
          gethomepage.dev/name: Bazarr
--- a/kubernetes/apps/default/calibre/app/helmrelease.yaml
+++ b/kubernetes/apps/default/calibre/app/helmrelease.yaml
@@ -51,7 +51,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:bookshelf
          gethomepage.dev/enabled: "true"
          gethomepage.dev/group: Media
          gethomepage.dev/name: Calibre
--- a/kubernetes/apps/default/exercisediary/app/helmrelease.yaml
+++ b/kubernetes/apps/default/exercisediary/app/helmrelease.yaml
@@ -52,7 +52,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:radio
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: exercisediary
          gethomepage.dev/description: Workout diary with GitHub-style year visualization.
--- a/kubernetes/apps/default/flood/app/helmrelease.yaml
+++ b/kubernetes/apps/default/flood/app/helmrelease.yaml
@@ -62,7 +62,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:download
          gethomepage.dev/enabled: "true"
          gethomepage.dev/group: Media
          gethomepage.dev/name: qBittorrent
--- a/kubernetes/apps/default/freshrss/app/helmrelease.yaml
+++ b/kubernetes/apps/default/freshrss/app/helmrelease.yaml
@@ -56,7 +56,6 @@ spec:
        enabled: true
        className: internal
        annotations:
-          hajimari.io/icon: mdi:rss
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: FreshRSS
          gethomepage.dev/description: Developer platform to turn scripts into workflows and UIs
--- a/kubernetes/apps/default/frigate/app/helmrelease.yaml
+++ b/kubernetes/apps/default/frigate/app/helmrelease.yaml
@@ -92,7 +92,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:cctv
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Frigate
          gethomepage.dev/description: NVR with realtime local object detection for IP cameras
--- a/kubernetes/apps/default/ghostfolio/app/helmrelease.yaml
+++ b/kubernetes/apps/default/ghostfolio/app/helmrelease.yaml
@@ -68,7 +68,6 @@ spec:
        enabled: true
        className: internal
        annotations:
-          hajimari.io/icon: mdi:cash-multiple
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Ghostfolio
          gethomepage.dev/description: Open Source Wealth Management Software
--- a/kubernetes/apps/default/hajimari/app/helmrelease.yaml
+++ b/kubernetes/apps/default/hajimari/app/helmrelease.yaml
@@ -1,108 +0,0 @@
---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: hajimari
-spec:
-  interval: 30m
-  chart:
-    spec:
-      chart: hajimari
-      version: 2.0.2
-      sourceRef:
-        kind: HelmRepository
-        name: hajimari
-        namespace: flux-system
-  maxHistory: 2
-  install:
-    createNamespace: true
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    remediation:
-      retries: 3
-  uninstall:
-    keepHistory: false
-  values:
-    controller:
-      strategy: RollingUpdate
-    podAnnotations:
-      configmap.reloader.stakater.com/reload: hajimari-settings
-    env:
-      TZ: ${TIMEZONE}
-    hajimari:
-      title: Apps
-      lightTheme: tron
-      darkTheme: tron
-      alwaysTargetBlank: true
-      showSearch: false
-      showGreeting: false
-      showAppGroups: false
-      showAppStatus: false
-      showBookmarkGroups: false
-      showGlobalBookmarks: false
-      showAppUrls: false
-      defaultEnable: true
-      namespaceSelector:
-        matchNames:
-          - default
-          - flux-system
-          - observability
-          - network
-          - rook-ceph
-      customApps:
-        - group: servers
-          apps:
-            - name: opnsense
-              icon: mdi:router-network
-              url: "https://opnsense.${SECRET_DOMAIN}"
-            - name: truenas-remote
-              icon: mdi:nas
-              url: "https://truenas-remote.${SECRET_DOMAIN}"
-            - name: minio
-              icon: mdi:aws
-              url: "https://s3.${SECRET_INTERNAL_DOMAIN}"
-            - name: pikvm
-              icon: mdi:ip-network
-              url: "https://pikvm.${SECRET_DOMAIN}"
-      bookmarks:
-        - group: Kubernetes
-          bookmarks:
-            - name: auricom/home-ops
-              icon: ''
-              url: https://github.com/auricom/home-ops
-              targetBlank: false
-            - name: auricom/containers
-              icon: ''
-              url: https://github.com/auricom/containers
-              targetBlank: false
-            - name: k8s-at-home-search
-              icon: ''
-              url: https://whazor.github.io/k8s-at-home-search/
-              targetBlank: false
-    ingress:
-      app:
-        enabled: true
-        ingressClassName: internal
-        annotations:
-          hajimari.io/enable: "false"
-          hajimari.io/icon: weather-sunset
-          hajimari.io/instance: admin
-        hosts:
-          - host: &host apps.${SECRET_EXTERNAL_DOMAIN}
-            paths:
-              - path: /
-                pathType: Prefix
-        tls:
-          - hosts:
-              - *host
-    persistence:
-      data:
-        enabled: true
-        type: emptyDir
-    resources:
-      requests:
-        cpu: 100m
-        memory: 128M
--- a/kubernetes/apps/default/hajimari/app/kustomization.yaml
+++ b/kubernetes/apps/default/hajimari/app/kustomization.yaml
@@ -1,6 +0,0 @@
---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ./helmrelease.yaml
--- a/kubernetes/apps/default/hajimari/ks.yaml
+++ b/kubernetes/apps/default/hajimari/ks.yaml
@@ -1,28 +0,0 @@
---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: &app hajimari
-  namespace: &namespace default
-spec:
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
-  components:
-    - ../../../../components/gatus/guarded
-  interval: 1h
-  path: ./kubernetes/apps/default/hajimari/app
-  postBuild:
-    substitute:
-      APP: *app
-      GATUS_SUBDOMAIN: apps
-  prune: true
-  retryInterval: 2m
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-    namespace: flux-system
-  targetNamespace: *namespace
-  timeout: 5m
-  wait: false
--- a/kubernetes/apps/default/home-assistant/app/helmrelease.yaml
+++ b/kubernetes/apps/default/home-assistant/app/helmrelease.yaml
@@ -69,8 +69,6 @@ spec:
      app:
        enabled: true
        className: internal
-        annotations:
-          hajimari.io/icon: mdi:home-assistant
        hosts:
          - host: &host "hass.${SECRET_EXTERNAL_DOMAIN}"
            paths:
--- a/kubernetes/apps/default/homebox/app/helmrelease.yaml
+++ b/kubernetes/apps/default/homebox/app/helmrelease.yaml
@@ -47,11 +47,6 @@ spec:
        enabled: true
        className: internal
        annotations:
-          hajimari.io/enable: "true"
-          hajimari.io/appName: *app
-          hajimari.io/info: Inventory management system
-          hajimari.io/icon: devices
-          hajimari.io/targetBlank: "true"
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Homebox
          gethomepage.dev/description: Inventory and organization system built for the Home User
--- a/kubernetes/apps/default/jellyfin/app/helmrelease.yaml
+++ b/kubernetes/apps/default/jellyfin/app/helmrelease.yaml
@@ -101,8 +101,6 @@ spec:
      app:
        enabled: true
        className: external
-        annotations:
-          hajimari.io/icon: simple-icons:jellyfin
        hosts:
          - host: &host "{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
            paths:
--- a/kubernetes/apps/default/jellyseerr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/jellyseerr/app/helmrelease.yaml
@@ -73,8 +73,6 @@ spec:
      app:
        enabled: true
        className: external
-        annotations:
-          hajimari.io/icon: simple-icons:jellyfish-outline
        hosts:
          - host: &host1 "{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
            paths: &paths
--- a/kubernetes/apps/default/joplin/app/helmrelease.yaml
+++ b/kubernetes/apps/default/joplin/app/helmrelease.yaml
@@ -56,7 +56,6 @@ spec:
        enabled: true
        className: external
        annotations:
-          hajimari.io/icon: mdi:text
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Joplin
          gethomepage.dev/description: Secure note taking and to-do app with synchronisation capabilities
--- a/kubernetes/apps/default/komga/app/helmrelease.yaml
+++ b/kubernetes/apps/default/komga/app/helmrelease.yaml
@@ -47,7 +47,6 @@ spec:
        enabled: true
        className: internal
        annotations:
-          hajimari.io/icon: mdi:ideogram-cjk-variant
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Komga
          gethomepage.dev/description: Media server for comics/mangas/BDs/magazines/eBooks with API and OPDS support
--- a/kubernetes/apps/default/kustomization.yaml
+++ b/kubernetes/apps/default/kustomization.yaml
@@ -16,7 +16,6 @@ resources:
  - ./freshrss/ks.yaml
  - ./frigate/ks.yaml
  - ./ghostfolio/ks.yaml
-  - ./hajimari/ks.yaml
  - ./home-assistant/ks.yaml
  - ./homebox/ks.yaml
  - ./homelab/ks.yaml
--- a/kubernetes/apps/default/libmedium/app/helmrelease.yaml
+++ b/kubernetes/apps/default/libmedium/app/helmrelease.yaml
@@ -48,7 +48,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:file-document-arrow-right-outline
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Libmedium
          gethomepage.dev/description: Medium.com
--- a/kubernetes/apps/default/lidarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/lidarr/app/helmrelease.yaml
@@ -69,7 +69,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:headphones
        hosts:
          - host: *host
            paths:
--- a/kubernetes/apps/default/linkding/app/helmrelease.yaml
+++ b/kubernetes/apps/default/linkding/app/helmrelease.yaml
@@ -60,7 +60,6 @@ spec:
        enabled: true
        className: internal
        annotations:
-          hajimari.io/icon: link
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Linkding
          gethomepage.dev/description: Bookmark manager that is designed be to be minimal and fast
--- a/kubernetes/apps/default/lldap/app/helmrelease.yaml
+++ b/kubernetes/apps/default/lldap/app/helmrelease.yaml
@@ -58,7 +58,6 @@ spec:
      app:
        enabled: true
        annotations:
-          hajimari.io/icon: mdi:account-multiple
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: lldap
          gethomepage.dev/description: Light LDAP implementation
--- a/kubernetes/apps/default/lms/app/helmrelease.yaml
+++ b/kubernetes/apps/default/lms/app/helmrelease.yaml
@@ -62,7 +62,6 @@ spec:
        enabled: true
        className: internal
        annotations:
-          hajimari.io/icon: mdi:file-music
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Lyrion Music Server
          gethomepage.dev/description: Stream not only your local music collection, but content from many music services and internet radio stations to your players.
--- a/kubernetes/apps/default/lychee/app/helmrelease.yaml
+++ b/kubernetes/apps/default/lychee/app/helmrelease.yaml
@@ -77,7 +77,6 @@ spec:
        enabled: true
        className: external
        annotations:
-          hajimari.io/icon: mdi:camera
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Lychee
          gethomepage.dev/description: Photo-management tool.
--- a/kubernetes/apps/default/navidrome/app/helmrelease.yaml
+++ b/kubernetes/apps/default/navidrome/app/helmrelease.yaml
@@ -64,7 +64,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:music
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Navidrome
          gethomepage.dev/description: Modern music server and streamer compatible with subsonic/airsonic.
--- a/kubernetes/apps/default/outline/app/helmrelease.yaml
+++ b/kubernetes/apps/default/outline/app/helmrelease.yaml
@@ -81,7 +81,6 @@ spec:
        enabled: true
        className: internal
        annotations:
-          hajimari.io/icon: mdi:text-box-multiple
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Outline
          gethomepage.dev/description: A fast, collaborative, knowledge base.
--- a/kubernetes/apps/default/paperless/app/helmrelease.yaml
+++ b/kubernetes/apps/default/paperless/app/helmrelease.yaml
@@ -66,7 +66,6 @@ spec:
        enabled: true
        className: internal
        annotations:
-          hajimari.io/icon: mdi:barcode-scan
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Paperless
          gethomepage.dev/description: Document management system that transform physical documents into a searchable online archive.
--- a/kubernetes/apps/default/prowlarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/prowlarr/app/helmrelease.yaml
@@ -65,7 +65,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:movie-search
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Prowlarr
          gethomepage.dev/description: Torrent and Usenet Indexer manager/proxy.
--- a/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml
+++ b/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml
@@ -63,8 +63,6 @@ spec:
      app:
        enabled: true
        className: internal
-        annotations:
-          hajimari.io/icon: mdi:download
        hosts:
          - host: &host "{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
            paths:
--- a/kubernetes/apps/default/radarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/radarr/app/helmrelease.yaml
@@ -75,7 +75,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:filmstrip
        hosts:
          - host: *host
            paths:
--- a/kubernetes/apps/default/readeck/app/helmrelease.yaml
+++ b/kubernetes/apps/default/readeck/app/helmrelease.yaml
@@ -58,7 +58,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:fa-book
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Readeck
          gethomepage.dev/description: Saves the precious readable content of web pages to keep forever.
--- a/kubernetes/apps/default/redlib/app/helmrelease.yaml
+++ b/kubernetes/apps/default/redlib/app/helmrelease.yaml
@@ -61,7 +61,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:web
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Redlib
          gethomepage.dev/description: Reddit.com
--- a/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml
+++ b/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml
@@ -88,7 +88,6 @@ spec:
          # nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          # nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          # nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:download
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: SABnzbd
          gethomepage.dev/description: Automated Usenet download tool.
--- a/kubernetes/apps/default/sharry/app/helmrelease.yaml
+++ b/kubernetes/apps/default/sharry/app/helmrelease.yaml
@@ -50,7 +50,6 @@ spec:
        className: external
        annotations:
          nginx.ingress.kubernetes.io/proxy-body-size: "0"
-          hajimari.io/icon: mdi:account-arrow-up
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Sharry
          gethomepage.dev/description: Share files with others in a simple way.
--- a/kubernetes/apps/default/sonarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/sonarr/app/helmrelease.yaml
@@ -88,7 +88,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:television-classic
        hosts:
          - host: &host "{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
            paths:
--- a/kubernetes/apps/default/tandoor/app/helmrelease.yaml
+++ b/kubernetes/apps/default/tandoor/app/helmrelease.yaml
@@ -97,7 +97,6 @@ spec:
        enabled: true
        className: internal
        annotations:
-          hajimari.io/icon: mdi:chef-hat
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Tandoor
          gethomepage.dev/description: Managing recipes, planned meals, shopping lists.
--- a/kubernetes/apps/default/tdarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/tdarr/app/helmrelease.yaml
@@ -61,7 +61,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: material-symbols:switch-video-outline
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Tdarr
          gethomepage.dev/description: Distributed transcode automation using FFmpeg/HandBrake + Audio/Video library analytics.
--- a/kubernetes/apps/default/unifi/app/helmrelease.yaml
+++ b/kubernetes/apps/default/unifi/app/helmrelease.yaml
@@ -83,7 +83,6 @@ spec:
        className: internal
        annotations:
          nginx.ingress.kubernetes.io/backend-protocol: HTTPS
-          hajimari.io/icon: mdi:lan
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Unifi
          gethomepage.dev/description: Centralized enterprise-grade networking for home and business.
--- a/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml
+++ b/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml
@@ -65,7 +65,6 @@ spec:
        enabled: true
        className: external
        annotations:
-          hajimari.io/icon: mdi:lock
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Vaultwarden
          gethomepage.dev/description: Open-source password manager compatible with Bitwarden clients.
--- a/kubernetes/apps/default/vikunja/app/helmrelease.yaml
+++ b/kubernetes/apps/default/vikunja/app/helmrelease.yaml
@@ -57,7 +57,6 @@ spec:
        annotations:
          external-dns.alpha.kubernetes.io/enabled: "true"
          external-dns.alpha.kubernetes.io/target: services.${SECRET_DOMAIN}.
-          hajimari.io/icon: mdi:format-list-checks
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Vikunja
          gethomepage.dev/description: Tasks and project management platform.
--- a/kubernetes/apps/default/zigbee2mqtt/app/helmrelease.yaml
+++ b/kubernetes/apps/default/zigbee2mqtt/app/helmrelease.yaml
@@ -84,7 +84,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:zigbee
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Zigbee2mqtt
          gethomepage.dev/description: Bridge for connecting Zigbee devices to MQTT networks.
--- a/kubernetes/apps/default/zwave-js-ui/app/helmrelease.yaml
+++ b/kubernetes/apps/default/zwave-js-ui/app/helmrelease.yaml
@@ -83,7 +83,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:z-wave
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Zwave-js-ui
          gethomepage.dev/description: Bridge for connecting Zwave devices to MQTT networks.
--- a/kubernetes/apps/external-secrets/external-secrets/stores/onepassword/helm/values.yaml
+++ b/kubernetes/apps/external-secrets/external-secrets/stores/onepassword/helm/values.yaml
@@ -92,8 +92,6 @@ service:
 #   app:
 #     enabled: true
 #     className: internal
-#     annotations:
-#       hajimari.io/enable: "false"
 #     hosts:
 #       - host: &host "{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
 #         paths:
--- a/kubernetes/apps/flux-system/flux-instance/app/ingress.yaml
+++ b/kubernetes/apps/flux-system/flux-instance/app/ingress.yaml
@@ -3,8 +3,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: webhook-receiver
-  annotations:
-    hajimari.io/enable: "false"
 spec:
  ingressClassName: external
  rules:
--- a/kubernetes/apps/flux-system/repositories/helm/external-dns.yaml
+++ b/kubernetes/apps/flux-system/repositories/helm/external-dns.yaml
@@ -1,10 +0,0 @@
---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: external-dns
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://kubernetes-sigs.github.io/external-dns
--- a/kubernetes/apps/flux-system/repositories/helm/external-secrets.yaml
+++ b/kubernetes/apps/flux-system/repositories/helm/external-secrets.yaml
@@ -1,10 +0,0 @@
---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: external-secrets
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://charts.external-secrets.io
--- a/kubernetes/apps/flux-system/repositories/helm/grafana.yaml
+++ b/kubernetes/apps/flux-system/repositories/helm/grafana.yaml
@@ -1,11 +0,0 @@
---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: grafana
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://grafana.github.io/helm-charts
-  timeout: 3m
--- a/kubernetes/apps/flux-system/repositories/helm/hajimari.yaml
+++ b/kubernetes/apps/flux-system/repositories/helm/hajimari.yaml
@@ -1,10 +0,0 @@
---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: hajimari
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://hajimari.io
--- a/kubernetes/apps/flux-system/repositories/helm/kustomization.yaml
+++ b/kubernetes/apps/flux-system/repositories/helm/kustomization.yaml
@@ -3,10 +3,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./external-dns.yaml
-  - ./external-secrets.yaml
-  - ./grafana.yaml
-  - ./hajimari.yaml
  - ./ingress-nginx.yaml
  - ./jetstack.yaml
  - ./k8s-gateway.yaml
--- a/kubernetes/apps/network/external-dns/cloudflare/helmrelease.yaml
+++ b/kubernetes/apps/network/external-dns/cloudflare/helmrelease.yaml
@@ -1,4 +1,13 @@
 ---
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: HelmRepository
+metadata:
+  name: external-dns
+  namespace: dns
+spec:
+  interval: 1h
+  url: https://kubernetes-sigs.github.io/external-dns/
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
@@ -13,7 +22,6 @@ spec:
      sourceRef:
        kind: HelmRepository
        name: external-dns
-        namespace: flux-system
  install:
    crds: CreateReplace
    remediation:
--- a/kubernetes/apps/ngnode/kustomization.yaml
+++ b/kubernetes/apps/ngnode/kustomization.yaml
@@ -2,9 +2,8 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+components:
+  - ../../components/common
 resources:
-  # Pre Flux-Kustomizations
-  - ./namespace.yaml
-  # Flux-Kustomizations
  - ./landing-page/ks.yaml

--- a/kubernetes/apps/ngnode/namespace.yaml
+++ b/kubernetes/apps/ngnode/namespace.yaml
@@ -1,7 +0,0 @@
---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: ngnode
-  labels:
-    kustomize.toolkit.fluxcd.io/prune: disabled
--- a/kubernetes/apps/observability/apprise/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/apprise/app/helmrelease.yaml
@@ -46,8 +46,6 @@ spec:
      app:
        enabled: true
        className: internal
-        annotations:
-          hajimari.io/icon: bell-cog
        hosts:
          - host: &host "{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
            paths:
--- a/kubernetes/apps/observability/gatus/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/gatus/app/helmrelease.yaml
@@ -97,7 +97,6 @@ spec:
      app:
        className: external
        annotations:
-          hajimari.io/icon: mdi:list-status
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Gatus
          gethomepage.dev/description: Automated developer-oriented status page.
--- a/kubernetes/apps/observability/grafana/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/grafana/app/helmrelease.yaml
@@ -1,28 +1,35 @@
 ---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1.json
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: OCIRepository
+metadata:
+  name: grafana
+spec:
+  interval: 5m
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 9.2.7
+  url: oci://ghcr.io/grafana/helm-charts/grafana
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
  name: grafana
 spec:
-  interval: 30m
-  chart:
-    spec:
-      chart: grafana
-      version: 9.2.2
-      sourceRef:
-        kind: HelmRepository
-        name: grafana
-        namespace: flux-system
+  interval: 1h
+  chartRef:
+    kind: OCIRepository
+    name: grafana
  install:
    remediation:
-      retries: 3
+      retries: -1
  upgrade:
    cleanupOnFail: true
    remediation:
      retries: 3
-  uninstall:
-    keepHistory: false
  values:
    annotations:
      reloader.stakater.com/auto: "true"
@@ -326,7 +333,6 @@ spec:
      enabled: true
      ingressClassName: internal
      annotations:
-        hajimari.io/icon: simple-icons:grafana
        gethomepage.dev/enabled: "true"
        gethomepage.dev/name: Grafana
        gethomepage.dev/description: Observability and data visualization platform.
--- a/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml
@@ -116,8 +116,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/appName: Prometheus
-          hajimari.io/icon: simple-icons:prometheus
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Prometheus
          gethomepage.dev/description: Systems and service monitoring system.
@@ -230,8 +228,6 @@ spec:
          nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
          nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
          nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/appName: Alert Manager
-          hajimari.io/icon: mdi:alert-decagram-outline
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Alert-Manager
          gethomepage.dev/description: Handles alerts sent by Prometheus.
--- a/kubernetes/apps/observability/scrutiny/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/scrutiny/app/helmrelease.yaml
@@ -52,7 +52,6 @@ spec:
        enabled: true
        className: internal
        annotations:
-          hajimari.io/icon: mdi:harddiskstatus
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Scrutiny
          gethomepage.dev/description: Hard Drive S.M.A.R.T Monitoring.
--- a/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml
+++ b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml
@@ -38,8 +38,6 @@ spec:
      dashboard:
        ingressClassName: internal
        annotations:
-          hajimari.io/appName: Rook
-          hajimari.io/icon: mdi:chess-rook
          gethomepage.dev/enabled: "true"
          gethomepage.dev/name: Rook
          gethomepage.dev/description: Cloud-Native Storage for Kubernetes.