From 35375f6635828326223e3e602612ce99cdb4f740 Mon Sep 17 00:00:00 2001 From: djeinstine Date: Mon, 10 Feb 2025 20:39:05 +0000 Subject: [PATCH] Fixed ES Lint issues and default imports --- .../api/kubernetes/stats/[...service].js | 2 +- .../api/kubernetes/status/[...service].js | 2 +- src/pages/api/widgets/kubernetes.js | 2 +- src/utils/config/kubernetes.js | 19 +++++++++---------- src/utils/config/service-helpers.js | 2 +- src/utils/kubernetes/httproute-list.js | 3 +-- src/utils/kubernetes/ingress-list.js | 2 +- src/utils/kubernetes/resource-helpers.js | 10 +++++----- src/utils/kubernetes/traefik-list.js | 3 +-- 9 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/pages/api/kubernetes/stats/[...service].js b/src/pages/api/kubernetes/stats/[...service].js index d9a4170ac..ef65f9be9 100644 --- a/src/pages/api/kubernetes/stats/[...service].js +++ b/src/pages/api/kubernetes/stats/[...service].js @@ -1,6 +1,6 @@ import { CoreV1Api, Metrics } from "@kubernetes/client-node"; -import getKubeConfig from "../../../../utils/config/kubernetes"; +import {getKubeConfig} from "../../../../utils/config/kubernetes"; import { parseCpu, parseMemory } from "../../../../utils/kubernetes/utils"; import createLogger from "../../../../utils/logger"; diff --git a/src/pages/api/kubernetes/status/[...service].js b/src/pages/api/kubernetes/status/[...service].js index e50d726c6..3999171e3 100644 --- a/src/pages/api/kubernetes/status/[...service].js +++ b/src/pages/api/kubernetes/status/[...service].js @@ -1,6 +1,6 @@ import { CoreV1Api } from "@kubernetes/client-node"; -import getKubeConfig from "../../../../utils/config/kubernetes"; +import {getKubeConfig} from "../../../../utils/config/kubernetes"; import createLogger from "../../../../utils/logger"; const logger = createLogger("kubernetesStatusService"); diff --git a/src/pages/api/widgets/kubernetes.js b/src/pages/api/widgets/kubernetes.js index de03a5568..c324d21f0 100644 --- a/src/pages/api/widgets/kubernetes.js +++ b/src/pages/api/widgets/kubernetes.js @@ -1,6 +1,6 @@ import { CoreV1Api, Metrics } from "@kubernetes/client-node"; -import getKubeConfig from "../../../utils/config/kubernetes"; +import {getKubeConfig} from "../../../utils/config/kubernetes"; import { parseCpu, parseMemory } from "../../../utils/kubernetes/utils"; import createLogger from "../../../utils/logger"; diff --git a/src/utils/config/kubernetes.js b/src/utils/config/kubernetes.js index aa826f85d..a4bb93851 100644 --- a/src/utils/config/kubernetes.js +++ b/src/utils/config/kubernetes.js @@ -6,7 +6,15 @@ import { KubeConfig,ApiextensionsV1Api } from "@kubernetes/client-node"; import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config"; -const getKubeConfig = () => { +export default function getKubernetes() { + checkAndCopyConfig("kubernetes.yaml"); + const configFile = path.join(CONF_DIR, "kubernetes.yaml"); + const rawConfigData = readFileSync(configFile, "utf8"); + const configData = substituteEnvironmentVars(rawConfigData); + return yaml.load(configData); +} + +export const getKubeConfig = () => { const kc = new KubeConfig(); const config = getKubernetes() @@ -25,14 +33,6 @@ const getKubeConfig = () => { return kc }; -export function getKubernetes() { - checkAndCopyConfig("kubernetes.yaml"); - const configFile = path.join(CONF_DIR, "kubernetes.yaml"); - const rawConfigData = readFileSync(configFile, "utf8"); - const configData = substituteEnvironmentVars(rawConfigData); - return yaml.load(configData); -} - export async function checkCRD(name,kc,logger) { const apiExtensions = kc.makeApiClient(ApiextensionsV1Api); const exist = await apiExtensions @@ -53,7 +53,6 @@ export async function checkCRD(name,kc,logger) { return exist; } -export default getKubeConfig; export const ANNOTATION_BASE = "gethomepage.dev"; export const ANNOTATION_WIDGET_BASE = `${ANNOTATION_BASE}/widget.`; export const HTTPROUTE_API_GROUP = "gateway.networking.k8s.io"; diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js index 2a289e007..46097a0e6 100644 --- a/src/utils/config/service-helpers.js +++ b/src/utils/config/service-helpers.js @@ -8,7 +8,7 @@ import createLogger from "utils/logger"; import checkAndCopyConfig, { CONF_DIR, getSettings, substituteEnvironmentVars } from "utils/config/config"; import getDockerArguments from "utils/config/docker"; import kubernetes from "utils/kubernetes/export"; -import getKubeConfig from "utils/config/kubernetes"; +import {getKubeConfig} from "utils/config/kubernetes"; import * as shvl from "utils/config/shvl"; const logger = createLogger("service-helpers"); diff --git a/src/utils/kubernetes/httproute-list.js b/src/utils/kubernetes/httproute-list.js index ea106eb12..4518462c7 100644 --- a/src/utils/kubernetes/httproute-list.js +++ b/src/utils/kubernetes/httproute-list.js @@ -1,8 +1,7 @@ import { CustomObjectsApi, CoreV1Api } from "@kubernetes/client-node"; -import getKubeConfig, {getKubernetes} from "utils/config/kubernetes"; -import { HTTPROUTE_API_GROUP,HTTPROUTE_API_VERSION } from "utils/config/kubernetes"; +import getKubernetes, {getKubeConfig,HTTPROUTE_API_GROUP,HTTPROUTE_API_VERSION} from "utils/config/kubernetes"; import createLogger from "utils/logger"; const logger = createLogger("httproute-list"); diff --git a/src/utils/kubernetes/ingress-list.js b/src/utils/kubernetes/ingress-list.js index fff65b58f..26bcc5a42 100644 --- a/src/utils/kubernetes/ingress-list.js +++ b/src/utils/kubernetes/ingress-list.js @@ -1,6 +1,6 @@ import {NetworkingV1Api} from "@kubernetes/client-node"; -import getKubeConfig, {getKubernetes} from "utils/config/kubernetes"; +import getKubernetes, {getKubeConfig} from "utils/config/kubernetes"; import createLogger from "utils/logger"; const logger = createLogger("ingress-list"); diff --git a/src/utils/kubernetes/resource-helpers.js b/src/utils/kubernetes/resource-helpers.js index 094bee19a..3c29485aa 100644 --- a/src/utils/kubernetes/resource-helpers.js +++ b/src/utils/kubernetes/resource-helpers.js @@ -1,6 +1,6 @@ import { CustomObjectsApi } from "@kubernetes/client-node"; -import getKubeConfig,{ ANNOTATION_BASE,ANNOTATION_WIDGET_BASE,HTTPROUTE_API_GROUP,HTTPROUTE_API_VERSION } from "utils/config/kubernetes"; +import { getKubeConfig,ANNOTATION_BASE,ANNOTATION_WIDGET_BASE,HTTPROUTE_API_GROUP,HTTPROUTE_API_VERSION } from "utils/config/kubernetes"; import { substituteEnvironmentVars } from "utils/config/config"; import createLogger from "utils/logger"; import * as shvl from "utils/config/shvl"; @@ -47,12 +47,12 @@ const getSchemaFromGateway = async (gatewayRef) => { } async function getUrlSchema(resource) { - const isHttpRoute = resource.kind == "HTTPRoute"; + const isHttpRoute = resource.kind === "HTTPRoute"; let urlSchema; - if (!isHttpRoute){ - urlSchema = getUrlFromIngress(resource); - }else{ + if (isHttpRoute){ urlSchema = getUrlFromHttpRoute(resource); + }else{ + urlSchema = getUrlFromIngress(resource); } return urlSchema; } diff --git a/src/utils/kubernetes/traefik-list.js b/src/utils/kubernetes/traefik-list.js index 0a256b2d1..1f911c75b 100644 --- a/src/utils/kubernetes/traefik-list.js +++ b/src/utils/kubernetes/traefik-list.js @@ -1,7 +1,6 @@ import CustomObjectsApi from "@kubernetes/client-node"; -import getKubeConfig, {getKubernetes} from "utils/config/kubernetes"; -import { checkCRD,ANNOTATION_BASE } from "utils/config/kubernetes"; +import getKubernetes,{ getKubeConfig,checkCRD,ANNOTATION_BASE } from "utils/config/kubernetes"; import createLogger from "utils/logger"; const logger = createLogger("traefik-list");