From 4248db7f2193c6b345af7f225e8a5f3efba8ffa2 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 18 Oct 2023 08:57:10 -0700
Subject: [PATCH] k8s: Support app ingress annotation (#2198)

---
 docs/configs/kubernetes.md                      | 1 +
 src/pages/api/kubernetes/stats/[...service].js  | 2 +-
 src/pages/api/kubernetes/status/[...service].js | 2 +-
 src/utils/config/service-helpers.js             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/configs/kubernetes.md b/docs/configs/kubernetes.md
index 1035db404..1d46fe8c2 100644
--- a/docs/configs/kubernetes.md
+++ b/docs/configs/kubernetes.md
@@ -110,6 +110,7 @@ metadata:
         gethomepage.dev/description: Media Server
         gethomepage.dev/group: Media
         gethomepage.dev/icon: emby.png
+        gethomepage.dev/app: emby-app # optional, may be needed if app.kubernetes.io/name != ingress metadata.name
         gethomepage.dev/name: Emby
         gethomepage.dev/widget.type: "emby"
         gethomepage.dev/widget.url: "https://emby.example.com"
diff --git a/src/pages/api/kubernetes/stats/[...service].js b/src/pages/api/kubernetes/stats/[...service].js
index 52ddcffa7..160890748 100644
--- a/src/pages/api/kubernetes/stats/[...service].js
+++ b/src/pages/api/kubernetes/stats/[...service].js
@@ -45,7 +45,7 @@ export default async function handler(req, res) {
 
     if (pods.length === 0) {
       res.status(404).send({
-        error: "not found"
+        error: `no pods found with namespace=${namespace} and labelSelector=${labelSelector}`,
       });
       return;
     }
diff --git a/src/pages/api/kubernetes/status/[...service].js b/src/pages/api/kubernetes/status/[...service].js
index b52a05d0a..cc4a24417 100644
--- a/src/pages/api/kubernetes/status/[...service].js
+++ b/src/pages/api/kubernetes/status/[...service].js
@@ -42,7 +42,7 @@ export default async function handler(req, res) {
 
     if (pods.length === 0) {
       res.status(404).send({
-        error: "not found",
+        error: `no pods found with namespace=${namespace} and labelSelector=${labelSelector}`,
       });
       return;
     }
diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index 6cdddf672..741c49c4d 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -237,7 +237,7 @@ export async function servicesFromKubernetes() {
       )
       .map((ingress) => {
         let constructedService = {
-          app: ingress.metadata.name,
+          app: ingress.metadata.annotations[`${ANNOTATION_BASE}/app`] || ingress.metadata.name,
           namespace: ingress.metadata.namespace,
           href: ingress.metadata.annotations[`${ANNOTATION_BASE}/href`] || getUrlFromIngress(ingress),
           name: ingress.metadata.annotations[`${ANNOTATION_BASE}/name`] || ingress.metadata.name,