Applied prettier to code

This commit is contained in:
djeinstine 2024-11-09 19:30:09 +00:00
parent cb2c7b9147
commit bbb1ef5a55
3 changed files with 163 additions and 169 deletions

View File

@ -7,36 +7,31 @@ import { KubeConfig } from "@kubernetes/client-node";
import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config"; import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config";
const extractKubeData = (config) => { const extractKubeData = (config) => {
//kubeconfig //kubeconfig
const kc = new KubeConfig(); const kc = new KubeConfig();
kc.loadFromCluster() kc.loadFromCluster();
//route //route
let route="ingress"; let route = "ingress";
if (config?.route=="gateway"){ if (config?.route == "gateway") {
route="gateway"; route = "gateway";
} }
//traefik //traefik
let traefik=true; let traefik = true;
if (config?.traefik=="disable"){ if (config?.traefik == "disable") {
traefik=false; traefik = false;
} }
//traefik //traefik
let metrics=true; let metrics = true;
if (config?.metrics=="disable"){ if (config?.metrics == "disable") {
metrics=false; metrics = false;
} }
//return //return
return {"config":kc, return { config: kc, route: route, traefik: traefik, metrics: metrics };
"route":route, };
"traefik":traefik,
"metrics":metrics
};
}
export default function getKubeArguments() { export default function getKubeArguments() {
checkAndCopyConfig("kubernetes.yaml"); checkAndCopyConfig("kubernetes.yaml");
@ -56,7 +51,7 @@ export default function getKubeArguments() {
break; break;
case "disabled": case "disabled":
default: default:
kubeData=null; kubeData = null;
} }
return kubeData; return kubeData;

View File

@ -8,7 +8,7 @@ import { ApiextensionsV1Api } from "@kubernetes/client-node";
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 {getUrlSchema,getRouteList} from "utils/kubernetes/kubernetes-routes"; import { getUrlSchema, getRouteList } from "utils/kubernetes/kubernetes-routes";
import * as shvl from "utils/config/shvl"; import * as shvl from "utils/config/shvl";
const logger = createLogger("service-helpers"); const logger = createLogger("service-helpers");
@ -165,7 +165,8 @@ export async function servicesFromKubernetes() {
return []; return [];
} }
const services = await Promise.all(routeList const services = await Promise.all(
routeList
.filter( .filter(
(route) => (route) =>
route.metadata.annotations && route.metadata.annotations &&
@ -174,11 +175,11 @@ export async function servicesFromKubernetes() {
route.metadata.annotations[`${ANNOTATION_BASE}/instance`] === instanceName || route.metadata.annotations[`${ANNOTATION_BASE}/instance`] === instanceName ||
`${ANNOTATION_BASE}/instance.${instanceName}` in route.metadata.annotations), `${ANNOTATION_BASE}/instance.${instanceName}` in route.metadata.annotations),
) )
.map( async (route) => { .map(async (route) => {
let constructedService = { let constructedService = {
app: route.metadata.annotations[`${ANNOTATION_BASE}/app`] || route.metadata.name, app: route.metadata.annotations[`${ANNOTATION_BASE}/app`] || route.metadata.name,
namespace: route.metadata.namespace, namespace: route.metadata.namespace,
href: route.metadata.annotations[`${ANNOTATION_BASE}/href`] || await getUrlSchema(route), href: route.metadata.annotations[`${ANNOTATION_BASE}/href`] || (await getUrlSchema(route)),
name: route.metadata.annotations[`${ANNOTATION_BASE}/name`] || route.metadata.name, name: route.metadata.annotations[`${ANNOTATION_BASE}/name`] || route.metadata.name,
group: route.metadata.annotations[`${ANNOTATION_BASE}/group`] || "Kubernetes", group: route.metadata.annotations[`${ANNOTATION_BASE}/group`] || "Kubernetes",
weight: route.metadata.annotations[`${ANNOTATION_BASE}/weight`] || "0", weight: route.metadata.annotations[`${ANNOTATION_BASE}/weight`] || "0",
@ -220,7 +221,7 @@ export async function servicesFromKubernetes() {
logger.debug(e); logger.debug(e);
} }
return constructedService; return constructedService;
}) }),
); );
const mappedServiceGroups = []; const mappedServiceGroups = [];

View File

@ -1,5 +1,3 @@
import { CustomObjectsApi, NetworkingV1Api, CoreV1Api, ApiextensionsV1Api } from "@kubernetes/client-node"; import { CustomObjectsApi, NetworkingV1Api, CoreV1Api, ApiextensionsV1Api } from "@kubernetes/client-node";
import getKubeArguments from "utils/config/kubernetes"; import getKubeArguments from "utils/config/kubernetes";
import createLogger from "utils/logger"; import createLogger from "utils/logger";
@ -9,8 +7,8 @@ const logger = createLogger("service-helpers");
const kubeArguments = getKubeArguments(); const kubeArguments = getKubeArguments();
const kc = kubeArguments.config; const kc = kubeArguments.config;
const apiGroup = 'gateway.networking.k8s.io'; const apiGroup = "gateway.networking.k8s.io";
const version = 'v1'; const version = "v1";
let crd; let crd;
let core; let core;
@ -18,7 +16,6 @@ let networking;
let routingType; let routingType;
let traefik; let traefik;
export async function checkCRD(kc, name) { export async function checkCRD(kc, name) {
const apiExtensions = kc.makeApiClient(ApiextensionsV1Api); const apiExtensions = kc.makeApiClient(ApiextensionsV1Api);
const exist = await apiExtensions const exist = await apiExtensions
@ -41,8 +38,14 @@ export async function checkCRD(kc, name) {
const getSchemaFromGateway = async (gatewayRef) => { const getSchemaFromGateway = async (gatewayRef) => {
try { try {
const gateway = await crd.getNamespacedCustomObject(apiGroup, version, gatewayRef.namespace,"gateways",gatewayRef.name); const gateway = await crd.getNamespacedCustomObject(
const listener = gateway.body.spec.listeners.filter((listener)=>listener.name==gatewayRef.sectionName)[0]; apiGroup,
version,
gatewayRef.namespace,
"gateways",
gatewayRef.name,
);
const listener = gateway.body.spec.listeners.filter((listener) => listener.name == gatewayRef.sectionName)[0];
return listener.protocol.toLowerCase(); return listener.protocol.toLowerCase();
} catch (err) { } catch (err) {
console.error(err); console.error(err);
@ -52,12 +55,11 @@ const getSchemaFromGateway = async (gatewayRef) => {
async function getUrlFromHttpRoute(ingress) { async function getUrlFromHttpRoute(ingress) {
const urlHost = ingress.spec.hostnames[0]; const urlHost = ingress.spec.hostnames[0];
const urlPath = ingress.spec.rules[0].matches[0].path.value; const urlPath = ingress.spec.rules[0].matches[0].path.value;
const urlSchema = await getSchemaFromGateway(ingress.spec.parentRefs[0]) ? "https" : "http"; const urlSchema = (await getSchemaFromGateway(ingress.spec.parentRefs[0])) ? "https" : "http";
// const urlSchema = "https" // const urlSchema = "https"
return `${urlSchema}://${urlHost}${urlPath}`; return `${urlSchema}://${urlHost}${urlPath}`;
} }
function getUrlFromIngress(ingress) { function getUrlFromIngress(ingress) {
const urlHost = ingress.spec.rules[0].host; const urlHost = ingress.spec.rules[0].host;
const urlPath = ingress.spec.rules[0].http.paths[0].path; const urlPath = ingress.spec.rules[0].http.paths[0].path;
@ -65,27 +67,27 @@ function getUrlFromIngress(ingress) {
return `${urlSchema}://${urlHost}${urlPath}`; return `${urlSchema}://${urlHost}${urlPath}`;
} }
async function getHttpRouteList(){ async function getHttpRouteList() {
const httpRouteList = new Array(); const httpRouteList = new Array();
const namespaces = await core.listNamespace() const namespaces = await core
.then((response) => response.body.items.map(ns => ns.metadata.name)) .listNamespace()
.then((response) => response.body.items.map((ns) => ns.metadata.name))
.catch((error) => { .catch((error) => {
logger.error("Error getting namespaces: %d %s %s", error.statusCode, error.body, error.response); logger.error("Error getting namespaces: %d %s %s", error.statusCode, error.body, error.response);
logger.debug(error); logger.debug(error);
return null; return null;
}) });
if (namespaces){ if (namespaces) {
// Iterate over each namespace // Iterate over each namespace
for (const namespace of namespaces) { for (const namespace of namespaces) {
try { try {
// Fetch the httproute from one namespaces // Fetch the httproute from one namespaces
const httpRoute = await crd.listNamespacedCustomObject(apiGroup,version,namespace,'httproutes'); const httpRoute = await crd.listNamespacedCustomObject(apiGroup, version, namespace, "httproutes");
if (httpRoute.body.items.length !== 0){ if (httpRoute.body.items.length !== 0) {
httpRouteList.push(httpRoute.body.items[0]); httpRouteList.push(httpRoute.body.items[0]);
} }
} catch (err) { } catch (err) {
console.error(`Error fetching httproutes objects in namespace "${namespace}":`, err.body || err.message); console.error(`Error fetching httproutes objects in namespace "${namespace}":`, err.body || err.message);
} }
@ -94,8 +96,7 @@ async function getHttpRouteList(){
return httpRouteList; return httpRouteList;
} }
async function getIngressList(){ async function getIngressList() {
const ingressList = await networking const ingressList = await networking
.listIngressForAllNamespaces(null, null, null, null) .listIngressForAllNamespaces(null, null, null, null)
.then((response) => response.body) .then((response) => response.body)
@ -105,7 +106,7 @@ async function getIngressList(){
return null; return null;
}); });
if (traefik){ if (traefik) {
const traefikContainoExists = await checkCRD(kc, "ingressroutes.traefik.containo.us"); const traefikContainoExists = await checkCRD(kc, "ingressroutes.traefik.containo.us");
const traefikExists = await checkCRD(kc, "ingressroutes.traefik.io"); const traefikExists = await checkCRD(kc, "ingressroutes.traefik.io");
@ -156,8 +157,7 @@ async function getIngressList(){
return ingressList.items; return ingressList.items;
} }
export async function getRouteList(){ export async function getRouteList() {
let routeList = new Array(); let routeList = new Array();
if (!kc) { if (!kc) {
@ -171,7 +171,6 @@ export async function getRouteList(){
routingType = kubeArguments.route; routingType = kubeArguments.route;
traefik = kubeArguments.traefik; traefik = kubeArguments.traefik;
switch (routingType) { switch (routingType) {
case "ingress": case "ingress":
routeList = await getIngressList(); routeList = await getIngressList();
@ -200,5 +199,4 @@ export async function getUrlSchema(route) {
urlSchema = getUrlFromIngress(route); urlSchema = getUrlFromIngress(route);
} }
return urlSchema; return urlSchema;
} }