diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js index 8b7317d06..7f9d45e40 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])); } }); @@ -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; });