From d65cb638be7e3b0487c77f717cbceca6a0338bc1 Mon Sep 17 00:00:00 2001
From: djeinstine <djeinstine@gmail.com>
Date: Fri, 8 Nov 2024 15:08:01 +0000
Subject: [PATCH] Moved crd checker to kubernetes-routes

---
 src/utils/config/service-helpers.js       | 20 --------------
 src/utils/kubernetes/kubernetes-routes.js | 33 +++++++++++++++++++----
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index 5f7c4bdd..068a1b3d 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -151,26 +151,6 @@ export async function servicesFromDocker() {
   return mappedServiceGroups;
 }
 
-export async function checkCRD(kc, name) {
-  const apiExtensions = kc.makeApiClient(ApiextensionsV1Api);
-  const exist = await apiExtensions
-    .readCustomResourceDefinitionStatus(name)
-    .then(() => true)
-    .catch(async (error) => {
-      if (error.statusCode === 403) {
-        logger.error(
-          "Error checking if CRD %s exists. Make sure to add the following permission to your RBAC: %d %s %s",
-          name,
-          error.statusCode,
-          error.body.message,
-        );
-      }
-      return false;
-    });
-
-  return exist;
-}
-
 export async function servicesFromKubernetes() {
   const ANNOTATION_BASE = "gethomepage.dev";
   const ANNOTATION_WIDGET_BASE = `${ANNOTATION_BASE}/widget.`;
diff --git a/src/utils/kubernetes/kubernetes-routes.js b/src/utils/kubernetes/kubernetes-routes.js
index 5fdbc6ca..7e3234a3 100644
--- a/src/utils/kubernetes/kubernetes-routes.js
+++ b/src/utils/kubernetes/kubernetes-routes.js
@@ -1,7 +1,10 @@
 
 
-import { CustomObjectsApi, NetworkingV1Api, CoreV1Api } from "@kubernetes/client-node";
+import { CustomObjectsApi, NetworkingV1Api, CoreV1Api, ApiextensionsV1Api } from "@kubernetes/client-node";
 import getKubeArguments from "utils/config/kubernetes";
+import createLogger from "utils/logger";
+
+const logger = createLogger("service-helpers");
 
 const kubeArguments = getKubeArguments();
 const kc = kubeArguments.config;
@@ -15,6 +18,27 @@ let networking;
 let routingType;
 let traefik;
 
+
+export async function checkCRD(kc, name) {
+  const apiExtensions = kc.makeApiClient(ApiextensionsV1Api);
+  const exist = await apiExtensions
+    .readCustomResourceDefinitionStatus(name)
+    .then(() => true)
+    .catch(async (error) => {
+      if (error.statusCode === 403) {
+        logger.error(
+          "Error checking if CRD %s exists. Make sure to add the following permission to your RBAC: %d %s %s",
+          name,
+          error.statusCode,
+          error.body.message,
+        );
+      }
+      return false;
+    });
+
+  return exist;
+}
+
 const getSchemaFromGateway = async (gatewayRef) => {
     try {
         const gateway = await crd.getNamespacedCustomObject(apiGroup, version, gatewayRef.namespace,"gateways",gatewayRef.name);
@@ -57,9 +81,9 @@ async function getHttpRouteList(){
         for (const namespace of namespaces) {
             try {
             // Fetch the httproute from one namespaces
-            const customObject = await crd.listNamespacedCustomObject(apiGroup,version,namespace,'httproutes');
-            if (customObject.body.items.length !== 0){
-                httpRouteList.push(customObject.body.items[0]);
+            const httpRoute = await crd.listNamespacedCustomObject(apiGroup,version,namespace,'httproutes');
+            if (httpRoute.body.items.length !== 0){
+                httpRouteList.push(httpRoute.body.items[0]);
             }
             
             } catch (err) {
@@ -175,6 +199,5 @@ export async function getUrlSchema(route) {
       default:
         urlSchema = getUrlFromIngress(route);
     }
-
     return urlSchema;
   }
\ No newline at end of file