From e6d95e29ee8eae89877379b0d67810cafee75165 Mon Sep 17 00:00:00 2001
From: Jon <jon@mscreations.net>
Date: Mon, 29 May 2023 01:14:03 -0400
Subject: [PATCH 1/2] Translate environment vars in labels

---
 src/utils/config/service-helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index 8b7317d06..1423e0162 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -86,7 +86,7 @@ export async function servicesFromDocker() {
                   type: 'service'
                 };
               }
-              shvl.set(constructedService, label.replace("homepage.", ""), container.Labels[label]);
+              shvl.set(constructedService, label.replace("homepage.", ""), substituteEnvironmentVars(container.Labels[label]));
             }
           });
 

From 56644ac487babbe13efd72c61dd365c1f6d92119 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sun, 28 May 2023 22:23:11 -0700
Subject: [PATCH 2/2] Support env substitution for k8s

---
 src/utils/config/service-helpers.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index 1423e0162..7f9d45e40 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -175,7 +175,7 @@ export async function servicesFromKubernetes() {
     const services = ingressList.items
       .filter((ingress) => ingress.metadata.annotations && ingress.metadata.annotations[`${ANNOTATION_BASE}/enabled`] === 'true')
       .map((ingress) => {
-      const constructedService = {
+      let constructedService = {
         app: ingress.metadata.name,
         namespace: ingress.metadata.namespace,
         href: ingress.metadata.annotations[`${ANNOTATION_BASE}/href`] || getUrlFromIngress(ingress),
@@ -202,6 +202,12 @@ export async function servicesFromKubernetes() {
         }
       });
 
+      try {
+        constructedService = JSON.parse(substituteEnvironmentVars(JSON.stringify(constructedService)));
+      } catch (e) {
+        logger.error("Error attempting k8s environment variable substitution.");
+      }
+
       return constructedService;
     });