0ct0pu5/homepage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1554 from mscreations/dynamic_env_vars

Browse source 
Enhancement: substitute environment vars in container labels
This commit is contained in:
shamoon 2023-05-28 23:20:16 -07:00 • committed by GitHub
commit 18cf4e7d5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/utils/config/service-helpers.js
View file

@ -86,7 +86,7 @@ export async function servicesFromDocker() {
type: 'service' 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 const services = ingressList.items
.filter((ingress) => ingress.metadata.annotations && ingress.metadata.annotations[`${ANNOTATION_BASE}/enabled`] === 'true') .filter((ingress) => ingress.metadata.annotations && ingress.metadata.annotations[`${ANNOTATION_BASE}/enabled`] === 'true')
.map((ingress) => { .map((ingress) => {
const constructedService = { let constructedService = {
app: ingress.metadata.name, app: ingress.metadata.name,
namespace: ingress.metadata.namespace, namespace: ingress.metadata.namespace,
href: ingress.metadata.annotations[`${ANNOTATION_BASE}/href`] || getUrlFromIngress(ingress), 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; return constructedService;
}); });