replaced getKubeConfig with getKubeArguments to be in line with getDockerArguments

This commit is contained in:
djeinstine
2024-10-17 13:56:35 +00:00
parent c347677402
commit 02e1104452
6 changed files with 28 additions and 14 deletions

View File

@@ -6,26 +6,40 @@ import { KubeConfig } from "@kubernetes/client-node";
import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config";
export default function getKubeConfig() {
const extractKubeData = (config) => {
//kubeconfig
const kc = new KubeConfig();
kc.loadFromCluster()
//route
let route="ingress";
if (config?.route=="gateway"){
route="gateway";
}
return {"config":kc,
"route":route};
}
export default function getKubeArguments() {
checkAndCopyConfig("kubernetes.yaml");
const configFile = path.join(CONF_DIR, "kubernetes.yaml");
const rawConfigData = readFileSync(configFile, "utf8");
const configData = substituteEnvironmentVars(rawConfigData);
const config = yaml.load(configData);
const kc = new KubeConfig();
let kubeData;
switch (config?.mode) {
case "cluster":
kc.loadFromCluster();
kubeData = extractKubeData(config);
break;
case "default":
kc.loadFromDefault();
kubeData = extractKubeData(config);
break;
case "disabled":
default:
return null;
kubeData=null;
}
return kc;
return kubeData;
}

View File

@@ -8,7 +8,7 @@ import { CustomObjectsApi, NetworkingV1Api, ApiextensionsV1Api } from "@kubernet
import createLogger from "utils/logger";
import checkAndCopyConfig, { CONF_DIR, getSettings, substituteEnvironmentVars } from "utils/config/config";
import getDockerArguments from "utils/config/docker";
import getKubeConfig from "utils/config/kubernetes";
import getKubeArguments from "utils/config/kubernetes";
import * as shvl from "utils/config/shvl";
const logger = createLogger("service-helpers");
@@ -186,7 +186,7 @@ export async function servicesFromKubernetes() {
checkAndCopyConfig("kubernetes.yaml");
try {
const kc = getKubeConfig();
const kc = getKubeArguments().config;
if (!kc) {
return [];
}

View File