From 16c5fb190fa1c86e31ed88a2d189b1edcbebbebe Mon Sep 17 00:00:00 2001 From: djeinstine Date: Mon, 10 Feb 2025 15:51:44 +0000 Subject: [PATCH] Removed kubernetes prefix from kubernetes files --- src/pages/api/kubernetes/stats/[...service].js | 2 +- src/pages/api/widgets/kubernetes.js | 4 ++-- src/utils/config/service-helpers.js | 2 +- src/utils/kubernetes/{kubernetes-export.js => export.js} | 6 +++--- .../{kubernetes-httproute-list.js => httproute-list.js} | 2 +- .../{kubernetes-ingress-list.js => ingress-list.js} | 2 +- .../{kubernetes-traefik-list.js => traefik-list.js} | 2 +- src/utils/kubernetes/{kubernetes-utils.js => utils.js} | 0 8 files changed, 10 insertions(+), 10 deletions(-) rename src/utils/kubernetes/{kubernetes-export.js => export.js} (55%) rename src/utils/kubernetes/{kubernetes-httproute-list.js => httproute-list.js} (96%) rename src/utils/kubernetes/{kubernetes-ingress-list.js => ingress-list.js} (93%) rename src/utils/kubernetes/{kubernetes-traefik-list.js => traefik-list.js} (97%) rename src/utils/kubernetes/{kubernetes-utils.js => utils.js} (100%) diff --git a/src/pages/api/kubernetes/stats/[...service].js b/src/pages/api/kubernetes/stats/[...service].js index 89554eec6..f90d2a226 100644 --- a/src/pages/api/kubernetes/stats/[...service].js +++ b/src/pages/api/kubernetes/stats/[...service].js @@ -1,7 +1,7 @@ import { CoreV1Api, Metrics } from "@kubernetes/client-node"; import getKubeArguments from "../../../../utils/config/kubernetes"; -import { parseCpu, parseMemory } from "../../../../utils/kubernetes/kubernetes-utils"; +import { parseCpu, parseMemory } from "../../../../utils/kubernetes/utils"; import createLogger from "../../../../utils/logger"; const logger = createLogger("kubernetesStatsService"); diff --git a/src/pages/api/widgets/kubernetes.js b/src/pages/api/widgets/kubernetes.js index eadb77cc7..0e2ba0628 100644 --- a/src/pages/api/widgets/kubernetes.js +++ b/src/pages/api/widgets/kubernetes.js @@ -1,10 +1,10 @@ import { CoreV1Api, Metrics } from "@kubernetes/client-node"; import getKubeArguments from "../../../utils/config/kubernetes"; -import { parseCpu, parseMemory } from "../../../utils/kubernetes/kubernetes-utils"; +import { parseCpu, parseMemory } from "../../../utils/kubernetes/utils"; import createLogger from "../../../utils/logger"; -const logger = createLogger("kubernetes-widget"); +const logger = createLogger("widget"); export default async function handler(req, res) { try { diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js index 92e4f23e1..5a74f8c54 100644 --- a/src/utils/config/service-helpers.js +++ b/src/utils/config/service-helpers.js @@ -7,7 +7,7 @@ import Docker from "dockerode"; 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/kubernetes-export"; +import kubernetes from "utils/kubernetes/export"; import getKubeArguments from "utils/config/kubernetes"; import * as shvl from "utils/config/shvl"; diff --git a/src/utils/kubernetes/kubernetes-export.js b/src/utils/kubernetes/export.js similarity index 55% rename from src/utils/kubernetes/kubernetes-export.js rename to src/utils/kubernetes/export.js index 555e59774..4787b2b56 100644 --- a/src/utils/kubernetes/kubernetes-export.js +++ b/src/utils/kubernetes/export.js @@ -1,6 +1,6 @@ -import listIngress from "utils/kubernetes/kubernetes-ingress-list"; -import listTraefikIngress from "utils/kubernetes/kubernetes-traefik-list"; -import listHttpRoute from "utils/kubernetes/kubernetes-httproute-list"; +import listIngress from "utils/kubernetes/ingress-list"; +import listTraefikIngress from "utils/kubernetes/traefik-list"; +import listHttpRoute from "utils/kubernetes/httproute-list"; import { isDiscoverable,constructedServiceFromResource } from "utils/kubernetes/resource-helpers"; const kubernetes = { diff --git a/src/utils/kubernetes/kubernetes-httproute-list.js b/src/utils/kubernetes/httproute-list.js similarity index 96% rename from src/utils/kubernetes/kubernetes-httproute-list.js rename to src/utils/kubernetes/httproute-list.js index c915b2b43..f79acfb6b 100644 --- a/src/utils/kubernetes/kubernetes-httproute-list.js +++ b/src/utils/kubernetes/httproute-list.js @@ -4,7 +4,7 @@ import { CustomObjectsApi, CoreV1Api } from "@kubernetes/client-node"; import { HTTPROUTE_API_GROUP,HTTPROUTE_API_VERSION } from "utils/config/kubernetes"; import createLogger from "utils/logger"; -const logger = createLogger("kubernetes-httproute-list"); +const logger = createLogger("httproute-list"); export default async function listHttpRoute(kubeArguments) { diff --git a/src/utils/kubernetes/kubernetes-ingress-list.js b/src/utils/kubernetes/ingress-list.js similarity index 93% rename from src/utils/kubernetes/kubernetes-ingress-list.js rename to src/utils/kubernetes/ingress-list.js index 8ffebc733..701601e9e 100644 --- a/src/utils/kubernetes/kubernetes-ingress-list.js +++ b/src/utils/kubernetes/ingress-list.js @@ -2,7 +2,7 @@ import {NetworkingV1Api} from "@kubernetes/client-node"; import createLogger from "utils/logger"; -const logger = createLogger("kubernetes-ingress-list"); +const logger = createLogger("ingress-list"); export default async function listIngress(kubeArguments) { diff --git a/src/utils/kubernetes/kubernetes-traefik-list.js b/src/utils/kubernetes/traefik-list.js similarity index 97% rename from src/utils/kubernetes/kubernetes-traefik-list.js rename to src/utils/kubernetes/traefik-list.js index 46519d732..7203c7891 100644 --- a/src/utils/kubernetes/kubernetes-traefik-list.js +++ b/src/utils/kubernetes/traefik-list.js @@ -3,7 +3,7 @@ import CustomObjectsApi from "@kubernetes/client-node"; import { checkCRD,ANNOTATION_BASE } from "utils/config/kubernetes"; import createLogger from "utils/logger"; -const logger = createLogger("kubernetes-traefik-list"); +const logger = createLogger("traefik-list"); export default async function listTraefikIngress(kubeArguments) { diff --git a/src/utils/kubernetes/kubernetes-utils.js b/src/utils/kubernetes/utils.js similarity index 100% rename from src/utils/kubernetes/kubernetes-utils.js rename to src/utils/kubernetes/utils.js