dominik/homepage-plus
1
0
Fork 0
mirror of https://github.com/DI0IK/homepage-plus.git synced 2025-07-09 06:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Enhancement: Add service discovery labels support for multiple homepage instances (#2340)

Browse source
This commit is contained in:
Timo 2023-11-21 04:27:19 +01:00 • committed by GitHub
parent 5bf6f30e2b
commit 6d21ea9ba3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import Docker from "dockerode";
import { CustomObjectsApi, NetworkingV1Api, ApiextensionsV1Api } from "@kubernetes/client-node";
import createLogger from "utils/logger";
import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config";
import checkAndCopyConfig, { CONF_DIR, getSettings, substituteEnvironmentVars } from "utils/config/config";
import getDockerArguments from "utils/config/docker";
import getKubeConfig from "utils/config/kubernetes";
import * as shvl from "utils/config/shvl";
@ -59,6 +59,8 @@ export async function servicesFromDocker() {
return [];
}
const { instanceName } = getSettings();
const serviceServers = await Promise.all(
Object.keys(servers).map(async (serverName) => {
try {
@ -82,6 +84,13 @@ export async function servicesFromDocker() {
Object.keys(containerLabels).forEach((label) => {
if (label.startsWith("homepage.")) {
let value = label.replace("homepage.", "");
if (instanceName && value.startsWith(`instance.${instanceName}.`)) {
value = value.replace(`instance.${instanceName}.`, "");
} else if (value.startsWith("instance.")) {
return;
}
if (!constructedService) {
constructedService = {
container: containerName.replace(/^\//, ""),
@ -89,11 +98,7 @@ export async function servicesFromDocker() {
type: "service",
};
}
shvl.set(
constructedService,
label.replace("homepage.", ""),
substituteEnvironmentVars(containerLabels[label]),
);
shvl.set(constructedService, value, substituteEnvironmentVars(containerLabels[label]));
}
});