replaced getKubeConfig with getKubeArguments to be in line with getDockerArguments
This commit is contained in:
parent
c347677402
commit
02e1104452
@ -1,6 +1,6 @@
|
|||||||
import { CoreV1Api, Metrics } from "@kubernetes/client-node";
|
import { CoreV1Api, Metrics } from "@kubernetes/client-node";
|
||||||
|
|
||||||
import getKubeConfig from "../../../../utils/config/kubernetes";
|
import getKubeArguments from "../../../../utils/config/kubernetes";
|
||||||
import { parseCpu, parseMemory } from "../../../../utils/kubernetes/kubernetes-utils";
|
import { parseCpu, parseMemory } from "../../../../utils/kubernetes/kubernetes-utils";
|
||||||
import createLogger from "../../../../utils/logger";
|
import createLogger from "../../../../utils/logger";
|
||||||
|
|
||||||
@ -20,7 +20,7 @@ export default async function handler(req, res) {
|
|||||||
const labelSelector = podSelector !== undefined ? podSelector : `${APP_LABEL}=${appName}`;
|
const labelSelector = podSelector !== undefined ? podSelector : `${APP_LABEL}=${appName}`;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const kc = getKubeConfig();
|
const kc = getKubeArguments().config;
|
||||||
if (!kc) {
|
if (!kc) {
|
||||||
res.status(500).send({
|
res.status(500).send({
|
||||||
error: "No kubernetes configuration",
|
error: "No kubernetes configuration",
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { CoreV1Api } from "@kubernetes/client-node";
|
import { CoreV1Api } from "@kubernetes/client-node";
|
||||||
|
|
||||||
import getKubeConfig from "../../../../utils/config/kubernetes";
|
import getKubeArguments from "../../../../utils/config/kubernetes";
|
||||||
import createLogger from "../../../../utils/logger";
|
import createLogger from "../../../../utils/logger";
|
||||||
|
|
||||||
const logger = createLogger("kubernetesStatusService");
|
const logger = createLogger("kubernetesStatusService");
|
||||||
@ -18,7 +18,7 @@ export default async function handler(req, res) {
|
|||||||
}
|
}
|
||||||
const labelSelector = podSelector !== undefined ? podSelector : `${APP_LABEL}=${appName}`;
|
const labelSelector = podSelector !== undefined ? podSelector : `${APP_LABEL}=${appName}`;
|
||||||
try {
|
try {
|
||||||
const kc = getKubeConfig();
|
const kc = getKubeArguments().config;
|
||||||
if (!kc) {
|
if (!kc) {
|
||||||
res.status(500).send({
|
res.status(500).send({
|
||||||
error: "No kubernetes configuration",
|
error: "No kubernetes configuration",
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { CoreV1Api, Metrics } from "@kubernetes/client-node";
|
import { CoreV1Api, Metrics } from "@kubernetes/client-node";
|
||||||
|
|
||||||
import getKubeConfig from "../../../utils/config/kubernetes";
|
import getKubeArguments from "../../../utils/config/kubernetes";
|
||||||
import { parseCpu, parseMemory } from "../../../utils/kubernetes/kubernetes-utils";
|
import { parseCpu, parseMemory } from "../../../utils/kubernetes/kubernetes-utils";
|
||||||
import createLogger from "../../../utils/logger";
|
import createLogger from "../../../utils/logger";
|
||||||
|
|
||||||
@ -8,7 +8,7 @@ const logger = createLogger("kubernetes-widget");
|
|||||||
|
|
||||||
export default async function handler(req, res) {
|
export default async function handler(req, res) {
|
||||||
try {
|
try {
|
||||||
const kc = getKubeConfig();
|
const kc = getKubeArguments().config;
|
||||||
if (!kc) {
|
if (!kc) {
|
||||||
return res.status(500).send({
|
return res.status(500).send({
|
||||||
error: "No kubernetes configuration",
|
error: "No kubernetes configuration",
|
||||||
|
|||||||
@ -6,26 +6,40 @@ import { KubeConfig } from "@kubernetes/client-node";
|
|||||||
|
|
||||||
import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config";
|
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");
|
checkAndCopyConfig("kubernetes.yaml");
|
||||||
|
|
||||||
const configFile = path.join(CONF_DIR, "kubernetes.yaml");
|
const configFile = path.join(CONF_DIR, "kubernetes.yaml");
|
||||||
const rawConfigData = readFileSync(configFile, "utf8");
|
const rawConfigData = readFileSync(configFile, "utf8");
|
||||||
const configData = substituteEnvironmentVars(rawConfigData);
|
const configData = substituteEnvironmentVars(rawConfigData);
|
||||||
const config = yaml.load(configData);
|
const config = yaml.load(configData);
|
||||||
const kc = new KubeConfig();
|
let kubeData;
|
||||||
|
|
||||||
switch (config?.mode) {
|
switch (config?.mode) {
|
||||||
case "cluster":
|
case "cluster":
|
||||||
kc.loadFromCluster();
|
kubeData = extractKubeData(config);
|
||||||
break;
|
break;
|
||||||
case "default":
|
case "default":
|
||||||
kc.loadFromDefault();
|
kubeData = extractKubeData(config);
|
||||||
break;
|
break;
|
||||||
case "disabled":
|
case "disabled":
|
||||||
default:
|
default:
|
||||||
return null;
|
kubeData=null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return kc;
|
return kubeData;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,7 +8,7 @@ import { CustomObjectsApi, NetworkingV1Api, ApiextensionsV1Api } from "@kubernet
|
|||||||
import createLogger from "utils/logger";
|
import createLogger from "utils/logger";
|
||||||
import checkAndCopyConfig, { CONF_DIR, getSettings, substituteEnvironmentVars } from "utils/config/config";
|
import checkAndCopyConfig, { CONF_DIR, getSettings, substituteEnvironmentVars } from "utils/config/config";
|
||||||
import getDockerArguments from "utils/config/docker";
|
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";
|
import * as shvl from "utils/config/shvl";
|
||||||
|
|
||||||
const logger = createLogger("service-helpers");
|
const logger = createLogger("service-helpers");
|
||||||
@ -186,7 +186,7 @@ export async function servicesFromKubernetes() {
|
|||||||
checkAndCopyConfig("kubernetes.yaml");
|
checkAndCopyConfig("kubernetes.yaml");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const kc = getKubeConfig();
|
const kc = getKubeArguments().config;
|
||||||
if (!kc) {
|
if (!kc) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|||||||
0
src/utils/kubernetes/kubernetes-crd.js
Normal file
0
src/utils/kubernetes/kubernetes-crd.js
Normal file
Loading…
Reference in New Issue
Block a user