diff --git a/src/common/k8s-api/api-kube.ts b/src/common/k8s-api/api-kube.ts index 51b04e6cfc..58aa95208a 100644 --- a/src/common/k8s-api/api-kube.ts +++ b/src/common/k8s-api/api-kube.ts @@ -4,14 +4,8 @@ */ import { getInjectionToken } from "@ogre-tools/injectable"; -import { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api"; import type { KubeJsonApi } from "./kube-json-api"; export const apiKubeInjectionToken = getInjectionToken({ id: "api-kube-injection-token", }); - -/** - * @deprecated Switch to using apiKubeInjectionToken instead - */ -export const apiKube = asLegacyGlobalForExtensionApi(apiKubeInjectionToken); diff --git a/src/common/k8s-api/index.ts b/src/common/k8s-api/index.ts deleted file mode 100644 index dd5a3504e6..0000000000 --- a/src/common/k8s-api/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -export { apiKube } from "./api-kube"; diff --git a/src/common/k8s-api/kube-api.ts b/src/common/k8s-api/kube-api.ts index 5165a5e130..3521c1ad70 100644 --- a/src/common/k8s-api/kube-api.ts +++ b/src/common/k8s-api/kube-api.ts @@ -7,7 +7,6 @@ import { merge } from "lodash"; import { stringify } from "querystring"; -import { apiKube } from "./index"; import { createKubeApiURL, parseKubeApi } from "./kube-api-parse"; import type { KubeObjectConstructor, KubeJsonApiDataFor, KubeObjectMetadata } from "./kube-object"; import { KubeObject, KubeStatus, isKubeStatusData } from "./kube-object"; @@ -23,6 +22,8 @@ import type { PartialDeep } from "type-fest"; import logger from "../logger"; import { Environments, getEnvironmentSpecificLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import autoRegistrationEmitterInjectable from "./api-manager/auto-registration-emitter.injectable"; +import { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api"; +import { apiKubeInjectionToken } from "./api-kube"; import type AbortController from "abort-controller"; /** @@ -236,7 +237,7 @@ export class KubeApi< constructor(opts: KubeApiOptions) { const { objectConstructor, - request = apiKube, + request, kind = objectConstructor.kind, isNamespaced, apiBase: fullApiPathname = objectConstructor.apiBase, @@ -262,7 +263,7 @@ export class KubeApi< this.apiGroup = apiGroup; this.apiVersion = apiVersion; this.apiResource = resource; - this.request = request; + this.request = request ?? asLegacyGlobalForExtensionApi(apiKubeInjectionToken); this.objectConstructor = objectConstructor; legacyRegisterApi(this); }