Code style lint

This commit is contained in:
shamoon
2025-02-11 06:50:30 -08:00
parent 10e840344a
commit f075317eff
11 changed files with 260 additions and 251 deletions

View File

@@ -2,7 +2,7 @@ import path from "path";
import { readFileSync } from "fs";
import yaml from "js-yaml";
import { KubeConfig,ApiextensionsV1Api } from "@kubernetes/client-node";
import { KubeConfig, ApiextensionsV1Api } from "@kubernetes/client-node";
import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config";
@@ -16,7 +16,7 @@ export default function getKubernetes() {
export const getKubeConfig = () => {
const kc = new KubeConfig();
const config = getKubernetes()
const config = getKubernetes();
switch (config?.mode) {
case "cluster":
@@ -30,10 +30,10 @@ export const getKubeConfig = () => {
return null;
}
return kc
return kc;
};
export async function checkCRD(name,kc,logger) {
export async function checkCRD(name, kc, logger) {
const apiExtensions = kc.makeApiClient(ApiextensionsV1Api);
const exist = await apiExtensions
.readCustomResourceDefinitionStatus(name)
@@ -56,4 +56,4 @@ export async function checkCRD(name,kc,logger) {
export const ANNOTATION_BASE = "gethomepage.dev";
export const ANNOTATION_WIDGET_BASE = `${ANNOTATION_BASE}/widget.`;
export const HTTPROUTE_API_GROUP = "gateway.networking.k8s.io";
export const HTTPROUTE_API_VERSION = "v1";
export const HTTPROUTE_API_VERSION = "v1";

View File

@@ -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");
@@ -177,42 +177,44 @@ export async function servicesFromKubernetes() {
if (!kc) {
return [];
}
// resource lists
const [ingressList, traefikIngressList, httpRouteList] = await Promise.all([
kubernetes.listIngress(),
kubernetes.listTraefikIngress(),
kubernetes.listHttpRoute()
kubernetes.listHttpRoute(),
]);
const resources = [ ...ingressList, ...traefikIngressList, ...httpRouteList ];
const resources = [...ingressList, ...traefikIngressList, ...httpRouteList];
if (!resources) {
return [];
}
const services = await Promise.all( resources
.filter(resource => kubernetes.isDiscoverable(resource, instanceName))
.map(async (resource) => kubernetes.constructedServiceFromResource(resource)));
const services = await Promise.all(
resources
.filter((resource) => kubernetes.isDiscoverable(resource, instanceName))
.map(async (resource) => kubernetes.constructedServiceFromResource(resource)),
);
// map service groups
const mappedServiceGroups = services.reduce((groups, serverService) => {
let serverGroup = groups.find(group => group.name === serverService.group);
let serverGroup = groups.find((group) => group.name === serverService.group);
if (!serverGroup) {
serverGroup = {
name: serverService.group,
services: []
services: [],
};
groups.push(serverGroup);
}
const { name: serviceName, group: _, ...pushedService } = serverService;
serverGroup.services.push({
name: serviceName,
...pushedService
...pushedService,
});
return groups;
}, []);