From 455103a9f162beb5bb31ee298c88537f323c51af Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 13 Feb 2025 09:42:08 -0800 Subject: [PATCH] Fix: correct k8s node response --- src/pages/api/kubernetes/stats/[...service].js | 1 - src/pages/api/kubernetes/status/[...service].js | 1 - src/pages/api/widgets/kubernetes.js | 13 +++++-------- src/utils/kubernetes/traefik-list.js | 2 -- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/pages/api/kubernetes/stats/[...service].js b/src/pages/api/kubernetes/stats/[...service].js index a330c55a..029f5a1d 100644 --- a/src/pages/api/kubernetes/stats/[...service].js +++ b/src/pages/api/kubernetes/stats/[...service].js @@ -34,7 +34,6 @@ export default async function handler(req, res) { namespace, labelSelector, }) - .then((response) => response.body) .catch((err) => { logger.error("Error getting pods: %d %s %s", err.statusCode, err.body, err.response); return null; diff --git a/src/pages/api/kubernetes/status/[...service].js b/src/pages/api/kubernetes/status/[...service].js index 55df9be9..e8558924 100644 --- a/src/pages/api/kubernetes/status/[...service].js +++ b/src/pages/api/kubernetes/status/[...service].js @@ -31,7 +31,6 @@ export default async function handler(req, res) { namespace, labelSelector, }) - .then((response) => response) .catch((err) => { logger.error("Error getting pods: %d %s %s", err.statusCode, err.body, err.response); return null; diff --git a/src/pages/api/widgets/kubernetes.js b/src/pages/api/widgets/kubernetes.js index c4d49aee..5f0f0136 100644 --- a/src/pages/api/widgets/kubernetes.js +++ b/src/pages/api/widgets/kubernetes.js @@ -17,14 +17,11 @@ export default async function handler(req, res) { const coreApi = kc.makeApiClient(CoreV1Api); const metricsApi = new Metrics(kc); - const nodes = await coreApi - .listNode() - .then((response) => response.body) - .catch((error) => { - logger.error("Error getting ingresses: %d %s %s", error.statusCode, error.body, error.response); - logger.debug(error); - return null; - }); + const nodes = await coreApi.listNode().catch((error) => { + logger.error("Error getting ingresses: %d %s %s", error.statusCode, error.body, error.response); + logger.debug(error); + return null; + }); if (!nodes) { return res.status(500).send({ error: "An error occurred while fetching nodes, check logs for more details.", diff --git a/src/utils/kubernetes/traefik-list.js b/src/utils/kubernetes/traefik-list.js index 17bd5c74..0368629a 100644 --- a/src/utils/kubernetes/traefik-list.js +++ b/src/utils/kubernetes/traefik-list.js @@ -21,7 +21,6 @@ export default async function listTraefikIngress() { version: "v1alpha1", plural: "ingressroutes", }) - .then((response) => response) .catch(async (error) => { if (traefikContainoExists) { logger.error( @@ -42,7 +41,6 @@ export default async function listTraefikIngress() { version: "v1alpha1", plural: "ingressroutes", }) - .then((response) => response.body) .catch(async (error) => { if (traefikExists) { logger.error(