From 304eed365407ffc896755d466720f07348297963 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 22 Mar 2023 12:28:28 -0400 Subject: [PATCH] Fix build issues for patch release (#7401) - Due to differences between master and release/v6.4 Signed-off-by: Sebastian Malton --- .../runnables/setup-auto-crd-api-creations.injectable.ts | 1 + .../hpa-details.test.tsx | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/core/src/renderer/before-frame-starts/runnables/setup-auto-crd-api-creations.injectable.ts b/packages/core/src/renderer/before-frame-starts/runnables/setup-auto-crd-api-creations.injectable.ts index c23a34d767..3a1e401a93 100644 --- a/packages/core/src/renderer/before-frame-starts/runnables/setup-auto-crd-api-creations.injectable.ts +++ b/packages/core/src/renderer/before-frame-starts/runnables/setup-auto-crd-api-creations.injectable.ts @@ -17,6 +17,7 @@ import { beforeClusterFrameStartsSecondInjectionToken } from "../tokens"; const setupAutoCrdApiCreationsInjectable = getInjectable({ id: "setup-auto-crd-api-creations", instantiate: (di) => ({ + id: "setup-auto-crd-api-creations", run: () => { const customResourceDefinitionStore = di.inject(customResourceDefinitionStoreInjectable); const injectableDifferencingRegistrator = injectableDifferencingRegistratorWith(di); diff --git a/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.test.tsx b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.test.tsx index a47066eb43..635b59cded 100644 --- a/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.test.tsx +++ b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.test.tsx @@ -6,7 +6,7 @@ import type { RenderResult } from "@testing-library/react"; import React from "react"; import directoryForKubeConfigsInjectable from "../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable"; import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; -import { Cluster } from "../../../common/cluster/cluster"; +import { createClusterInjectionToken } from "../../../common/cluster/create-cluster-injection-token"; import { HorizontalPodAutoscaler, HpaMetricType } from "../../../common/k8s-api/endpoints"; import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable"; import { getDiForUnitTesting } from "../../getDiForUnitTesting"; @@ -49,7 +49,10 @@ describe("", () => { di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); di.override(storesAndApisCanBeCreatedInjectable, () => true); - di.override(hostedClusterInjectable, () => new Cluster({ + + const createCluster = di.inject(createClusterInjectionToken); + + di.override(hostedClusterInjectable, () => createCluster({ contextName: "some-context-name", id: "some-cluster-id", kubeConfigPath: "/some-path-to-a-kubeconfig",