This commit is contained in:
Morten Olsen
2025-10-24 09:05:27 +02:00
parent 78995406ca
commit 2281dcafb4
10 changed files with 67 additions and 66 deletions

View File

@@ -8,7 +8,6 @@ class K8sConfig {
constructor() {
this.#config = new KubeConfig();
this.#config.loadFromDefault();
}
public get kubeConfig() {
@@ -17,7 +16,7 @@ class K8sConfig {
public get objectsApi() {
if (!this.#objectsApi) {
this.#objectsApi = this.#config.makeApiClient(KubernetesObjectApi)
this.#objectsApi = this.#config.makeApiClient(KubernetesObjectApi);
}
return this.#objectsApi;
}
@@ -31,7 +30,7 @@ class K8sConfig {
public get extensionsApi() {
if (!this.#extensionsApi) {
this.#extensionsApi = this.#config.makeApiClient(ApiextensionsV1Api)
this.#extensionsApi = this.#config.makeApiClient(ApiextensionsV1Api);
}
return this.#extensionsApi;
}

View File

@@ -2,14 +2,14 @@ import { z, type ZodType } from 'zod';
import { PatchStrategy, setHeaderOptions, type KubernetesObject } from '@kubernetes/client-node';
import { CronJob, CronTime } from 'cron';
import { CoalescingQueue } from '@morten-olsen/box-utils/coalescing-queue';
import { FINALIZER } from '@morten-olsen/box-utils/consts';
// import { FINALIZER } from '@morten-olsen/box-utils/consts';
import { NotReadyError } from '../../errors/errors.js';
import { Resource, type ResourceOptions } from './resource.js';
import { K8sConfig } from '../../config/config.js';
import type { ResourceClass } from '../resources.service.js';
import { Resource, type ResourceOptions } from './resource.js';
const customResourceStatusSchema = z.object({
observedGeneration: z.number().optional(),
conditions: z

View File

@@ -1,4 +1,4 @@
import { ApiException, KubernetesObjectApi, PatchStrategy, type KubernetesObject } from '@kubernetes/client-node';
import { ApiException, PatchStrategy, type KubernetesObject } from '@kubernetes/client-node';
import deepEqual from 'deep-equal';
import type { Services } from '@morten-olsen/box-utils/services';
import { EventEmitter } from '@morten-olsen/box-utils/event-emitter';

View File

@@ -1,4 +1,4 @@
import { ApiException, ApiextensionsV1Api, type KubernetesObject } from '@kubernetes/client-node';
import { ApiException, type KubernetesObject } from '@kubernetes/client-node';
import type { ZodType } from 'zod';
import { EventEmitter } from '@morten-olsen/box-utils/event-emitter';
import type { Services } from '@morten-olsen/box-utils/services';
@@ -58,7 +58,7 @@ class ResourceService extends EventEmitter<ResourceServiceEvents> {
resources: [],
});
if ('dependsOn' in resource && Array.isArray(resource.dependsOn)) {
await this.register(...resource.dependsOn as ResourceClass<ExplicitAny>[]);
await this.register(...(resource.dependsOn as ResourceClass<ExplicitAny>[]));
}
const watcherService = this.#services.get(WatcherService);
const watcher = watcherService.create({