From 516498651ba1934bf890ced21d61d586ae39ec77 Mon Sep 17 00:00:00 2001
From: Danijel Simeunovic <danijel.simeunovic@fortedigital.com>
Date: Tue, 28 Apr 2026 14:10:12 +0200
Subject: [PATCH] homepage annotations

---
 infra/base/homepage/homepage.yaml      |  2 +-
 infra/values/base/argocd-values.yaml   | 10 ++++------
 infra/values/base/gitea-values.yaml    | 22 ++++++++++------------
 infra/values/base/grafana-values.yaml  | 23 ++++++++++-------------
 infra/values/base/homepage-values.yaml |  3 ++-
 infra/values/base/keycloak-values.yaml |  3 ---
 6 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/infra/base/homepage/homepage.yaml b/infra/base/homepage/homepage.yaml
index ffb507c..5caf146 100644
--- a/infra/base/homepage/homepage.yaml
+++ b/infra/base/homepage/homepage.yaml
@@ -17,7 +17,7 @@ spec:
   sources:
   - repoURL: https://jameswynn.github.io/helm-charts
     chart: homepage
-    targetRevision: "1.2.3"
+    targetRevision: "2.1.0"
     helm:
       releaseName: homepage
       valueFiles:
diff --git a/infra/values/base/argocd-values.yaml b/infra/values/base/argocd-values.yaml
index 8d39490..097a8ca 100644
--- a/infra/values/base/argocd-values.yaml
+++ b/infra/values/base/argocd-values.yaml
@@ -30,8 +30,11 @@ configs:
     "server.insecure": true
     "reposerver.enable.git.submodule": "false"
 server:
-  service:
+  ingress:
+    enabled: true
+    ingressClassName: traefik
     annotations:
+      cert-manager.io/cluster-issuer: letsencrypt-prod
       gethomepage.dev/enabled: "true"
       gethomepage.dev/name: "ArgoCD"
       gethomepage.dev/description: "GitOps continuous delivery"
@@ -41,11 +44,6 @@ server:
       gethomepage.dev/widget.type: "argocd"
       gethomepage.dev/widget.url: "https://argocd.forteapps.net"
       # gethomepage.dev/widget.key: "{{HOMEPAGE_VAR_ARGOCD_TOKEN}}"
-  ingress:
-    enabled: true
-    ingressClassName: traefik
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-prod
     tls: true
   extraArgs:
   - --insecure
diff --git a/infra/values/base/gitea-values.yaml b/infra/values/base/gitea-values.yaml
index ed2cc62..8b839df 100644
--- a/infra/values/base/gitea-values.yaml
+++ b/infra/values/base/gitea-values.yaml
@@ -114,6 +114,15 @@ ingress:
   className: traefik
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
+    gethomepage.dev/enabled: "true"
+    gethomepage.dev/name: "Gitea"
+    gethomepage.dev/description: "Git hosting & CI/CD"
+    gethomepage.dev/group: "DevOps"
+    gethomepage.dev/icon: "gitea"
+    gethomepage.dev/href: "https://git.forteapps.net"
+    gethomepage.dev/widget.type: "gitea"
+    gethomepage.dev/widget.url: "https://git.forteapps.net"
+    # gethomepage.dev/widget.key: "{{HOMEPAGE_VAR_GITEA_TOKEN}}"
   hosts:
   - host: git.forteapps.net
     paths:
@@ -175,19 +184,8 @@ redis-cluster:
 test:
   enabled: false
 
-# -- Services: HTTP (homepage discovery) + SSH (Traefik TCP IngressRoute on port 2222)
+# -- SSH service (ClusterIP, exposed externally via Traefik TCP IngressRoute on port 2222)
 service:
-  http:
-    annotations:
-      gethomepage.dev/enabled: "true"
-      gethomepage.dev/name: "Gitea"
-      gethomepage.dev/description: "Git hosting & CI/CD"
-      gethomepage.dev/group: "DevOps"
-      gethomepage.dev/icon: "gitea"
-      gethomepage.dev/href: "https://git.forteapps.net"
-      gethomepage.dev/widget.type: "gitea"
-      gethomepage.dev/widget.url: "https://git.forteapps.net"
-      # gethomepage.dev/widget.key: "{{HOMEPAGE_VAR_GITEA_TOKEN}}"
   ssh:
     type: ClusterIP
     port: 22
diff --git a/infra/values/base/grafana-values.yaml b/infra/values/base/grafana-values.yaml
index f3a183c..e19fef1 100644
--- a/infra/values/base/grafana-values.yaml
+++ b/infra/values/base/grafana-values.yaml
@@ -3,6 +3,16 @@ ingress:
   ingressClassName: traefik
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
+    gethomepage.dev/enabled: "true"
+    gethomepage.dev/name: "Grafana"
+    gethomepage.dev/description: "Metrics & observability dashboards"
+    gethomepage.dev/group: "Monitoring"
+    gethomepage.dev/icon: "grafana"
+    gethomepage.dev/href: "https://grafana.forteapps.net"
+    gethomepage.dev/widget.type: "grafana"
+    gethomepage.dev/widget.url: "https://grafana.forteapps.net"
+    # gethomepage.dev/widget.username: "{{HOMEPAGE_VAR_GRAFANA_USER}}"
+    # gethomepage.dev/widget.password: "{{HOMEPAGE_VAR_GRAFANA_PASSWORD}}"
   tls:
   - secretName: grafana-tls
     hosts:
@@ -16,19 +26,6 @@ resources:
     cpu: 100m
     memory: 256Mi
 
-service:
-  annotations:
-    gethomepage.dev/enabled: "true"
-    gethomepage.dev/name: "Grafana"
-    gethomepage.dev/description: "Metrics & observability dashboards"
-    gethomepage.dev/group: "Monitoring"
-    gethomepage.dev/icon: "grafana"
-    gethomepage.dev/href: "https://grafana.forteapps.net"
-    gethomepage.dev/widget.type: "grafana"
-    gethomepage.dev/widget.url: "https://grafana.forteapps.net"
-    # gethomepage.dev/widget.username: "{{HOMEPAGE_VAR_GRAFANA_USER}}"
-    # gethomepage.dev/widget.password: "{{HOMEPAGE_VAR_GRAFANA_PASSWORD}}"
-
 adminUser: admin
 adminPassword: "forte"
 
diff --git a/infra/values/base/homepage-values.yaml b/infra/values/base/homepage-values.yaml
index a680855..c1a081e 100644
--- a/infra/values/base/homepage-values.yaml
+++ b/infra/values/base/homepage-values.yaml
@@ -40,7 +40,8 @@ config:
         label: "Cluster"
       nodes:
         show: false
-  # Services section empty — all entries come from K8s annotations
+  # Both empty — all entries come from K8s service annotations
+  bookmarks: []
   services: []
   # Widget API credentials (optional — add via SealedSecret + envFrom below)
   # Homepage reads HOMEPAGE_VAR_* env vars and substitutes them in widget annotations.
diff --git a/infra/values/base/keycloak-values.yaml b/infra/values/base/keycloak-values.yaml
index 5616a4c..bfa2b2f 100644
--- a/infra/values/base/keycloak-values.yaml
+++ b/infra/values/base/keycloak-values.yaml
@@ -18,9 +18,6 @@ ingress:
   ingressClassName: traefik
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
-
-service:
-  annotations:
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "Keycloak"
     gethomepage.dev/description: "Identity & access management"