From 52067b1ea021ca138349753a7460a6c9b58b3292 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Fri, 20 Jan 2023 10:59:17 +0300 Subject: [PATCH] Making metric parser classes as not injectable Signed-off-by: Alex Andreev --- .../get-hpa-metrics.injectable.ts | 11 +++++------ .../hpa-v1-metric-parser.injectable.ts | 15 --------------- .../hpa-v2-metric-parser.injectable.ts | 15 --------------- 3 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 src/renderer/components/+config-autoscalers/hpa-v1-metric-parser.injectable.ts delete mode 100644 src/renderer/components/+config-autoscalers/hpa-v2-metric-parser.injectable.ts diff --git a/src/renderer/components/+config-autoscalers/get-hpa-metrics.injectable.ts b/src/renderer/components/+config-autoscalers/get-hpa-metrics.injectable.ts index d343c43241..e49ad92152 100644 --- a/src/renderer/components/+config-autoscalers/get-hpa-metrics.injectable.ts +++ b/src/renderer/components/+config-autoscalers/get-hpa-metrics.injectable.ts @@ -5,15 +5,14 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { HorizontalPodAutoscaler, HorizontalPodAutoscalerMetricSpec, HorizontalPodAutoscalerMetricStatus } from "../../../common/k8s-api/endpoints"; import { HpaMetricType } from "../../../common/k8s-api/endpoints"; -import horizonalPodAutoscalerV1MetricParser from "./hpa-v1-metric-parser.injectable"; -import type { HorizontalPodAutoscalerV2MetricParser } from "./hpa-v2-metric-parser"; -import horizonalPodAutoscalerV2MetricParser from "./hpa-v2-metric-parser.injectable"; +import { HorizontalPodAutoscalerV1MetricParser } from "./hpa-v1-metric-parser"; +import { HorizontalPodAutoscalerV2MetricParser } from "./hpa-v2-metric-parser"; const getHorizontalPodAutoscalerMetrics = getInjectable({ id: "get-horizontal-pod-autoscaler-metrics", - instantiate: (di) => (hpa: HorizontalPodAutoscaler) => { - const hpaV1Parser = di.inject(horizonalPodAutoscalerV1MetricParser); - const hpaV2Parser = di.inject(horizonalPodAutoscalerV2MetricParser); + instantiate: () => (hpa: HorizontalPodAutoscaler) => { + const hpaV1Parser = new HorizontalPodAutoscalerV1MetricParser(); + const hpaV2Parser = new HorizontalPodAutoscalerV2MetricParser(); const metrics = hpa.spec?.metrics ?? []; const currentMetrics = hpa.status?.currentMetrics ?? []; const cpuUtilization = hpa.spec?.targetCPUUtilizationPercentage; diff --git a/src/renderer/components/+config-autoscalers/hpa-v1-metric-parser.injectable.ts b/src/renderer/components/+config-autoscalers/hpa-v1-metric-parser.injectable.ts deleted file mode 100644 index 69b305d6c1..0000000000 --- a/src/renderer/components/+config-autoscalers/hpa-v1-metric-parser.injectable.ts +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; -import { HorizontalPodAutoscalerV1MetricParser } from "./hpa-v1-metric-parser"; - -const horizonalPodAutoscalerV1MetricParser = getInjectable({ - id: "horizontal-pod-autoscaler-v1-metric-parser", - instantiate: () => { - return new HorizontalPodAutoscalerV1MetricParser(); - }, -}); - -export default horizonalPodAutoscalerV1MetricParser; diff --git a/src/renderer/components/+config-autoscalers/hpa-v2-metric-parser.injectable.ts b/src/renderer/components/+config-autoscalers/hpa-v2-metric-parser.injectable.ts deleted file mode 100644 index 3b52ffeb60..0000000000 --- a/src/renderer/components/+config-autoscalers/hpa-v2-metric-parser.injectable.ts +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; -import { HorizontalPodAutoscalerV2MetricParser } from "./hpa-v2-metric-parser"; - -const horizonalPodAutoscalerV2MetricParser = getInjectable({ - id: "horizontal-pod-autoscaler-v2-metric-parser", - instantiate: () => { - return new HorizontalPodAutoscalerV2MetricParser(); - }, -}); - -export default horizonalPodAutoscalerV2MetricParser;