hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Check for legacy targetCPUUtilizationPercentage

Browse Source 
Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
Alex Andreev 2023-01-18 14:46:22 +03:00
parent 44a3ba38bf
commit 6f06d3645b
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/k8s-api/endpoints/horizontal-pod-autoscaler.api.ts
View File

@ -224,6 +224,7 @@ export interface HorizontalPodAutoscalerSpec {
maxReplicas: number; maxReplicas: number;
metrics?: HorizontalPodAutoscalerMetricSpec[]; metrics?: HorizontalPodAutoscalerMetricSpec[];
behavior?: HorizontalPodAutoscalerBehavior; behavior?: HorizontalPodAutoscalerBehavior;
targetCPUUtilizationPercentage?: number; // used only in autoscaling/v1
} }
export interface HorizontalPodAutoscalerStatus { export interface HorizontalPodAutoscalerStatus {
@ -231,6 +232,7 @@ export interface HorizontalPodAutoscalerStatus {
currentReplicas: number; currentReplicas: number;
desiredReplicas: number; desiredReplicas: number;
currentMetrics?: HorizontalPodAutoscalerMetricStatus[]; currentMetrics?: HorizontalPodAutoscalerMetricStatus[];
currentCPUUtilizationPercentage?: number; // used only in autoscaling/v1
} }
export class HorizontalPodAutoscaler extends KubeObject< export class HorizontalPodAutoscaler extends KubeObject<
@ -284,13 +286,13 @@ export class HorizontalPodAutoscalerApi extends KubeApi<HorizontalPodAutoscaler>
super(deps, { super(deps, {
...opts ?? {}, ...opts ?? {},
objectConstructor: HorizontalPodAutoscaler, objectConstructor: HorizontalPodAutoscaler,
// checkPreferredVersion: true, checkPreferredVersion: true,
// // Kubernetes < 1.26 // Kubernetes < 1.26
// fallbackApiBases: [ fallbackApiBases: [
// "/apis/autoscaling/v2beta2/horizontalpodautoscalers", "/apis/autoscaling/v2beta2/horizontalpodautoscalers",
// "/apis/autoscaling/v2beta1/horizontalpodautoscalers", "/apis/autoscaling/v2beta1/horizontalpodautoscalers",
// "/apis/autoscaling/v1/horizontalpodautoscalers", "/apis/autoscaling/v1/horizontalpodautoscalers",
// ], ],
}); });
} }
} }

16
src/renderer/components/+config-autoscalers/get-hpa-metrics.injectable.ts
View File

@ -11,15 +11,27 @@ const getHorizontalPodAutoscalerMetrics = getInjectable({
const hpaV2Parser = di.inject(horizonalPodAutoscalerV2MetricParser); const hpaV2Parser = di.inject(horizonalPodAutoscalerV2MetricParser);
const metrics = hpa.spec?.metrics ?? []; const metrics = hpa.spec?.metrics ?? [];
const currentMetrics = hpa.status?.currentMetrics ?? []; const currentMetrics = hpa.status?.currentMetrics ?? [];
const cpuUtilization = hpa.spec?.targetCPUUtilizationPercentage;
if (cpuUtilization) {
const utilizationCurrent = hpa.status?.currentCPUUtilizationPercentage ? `${hpa.status.currentCPUUtilizationPercentage}%` : "unknown";
const utilizationTarget = cpuUtilization ? `${cpuUtilization}%` : "unknown";
return [`${utilizationCurrent} / ${utilizationTarget}`];
}
return metrics.map((metric) => { return metrics.map((metric) => {
const currentMetric = currentMetrics.find(current => const currentMetric = currentMetrics.find(current =>
current.type === metric.type current.type === metric.type
&& getMetricName(current) === getMetricName(metric) && getMetricName(current) === getMetricName(metric)
); );
const parser = hpa.apiVersion.includes("v2") ? hpaV2Parser : hpaV1Parser;
const values = getMetricValues(parser, currentMetric, metric); const hpaV2ParserValues = getMetricValues(hpaV2Parser, currentMetric, metric);
const hpaV1ParserValues = getMetricValues(hpaV1Parser, currentMetric, metric);
let values = hpaV1ParserValues;
if (hpaV2ParserValues.current || hpaV2ParserValues.target) {
values = hpaV2ParserValues;
}
return `${values.current ?? "unknown"} / ${values.target ?? "unknown"}`; return `${values.current ?? "unknown"} / ${values.target ?? "unknown"}`;
}); });

2
src/renderer/components/+config-autoscalers/hpa.tsx
View File

@ -43,7 +43,7 @@ class NonInjectedHorizontalPodAutoscalers extends React.Component<Dependencies>
getTargets(hpa: HorizontalPodAutoscaler) { getTargets(hpa: HorizontalPodAutoscaler) {
const metrics = hpa.getMetrics(); const metrics = hpa.getMetrics();
if (metrics.length === 0) { if (metrics.length === 0 && !hpa.spec?.targetCPUUtilizationPercentage) {
return <p>--</p>; return <p>--</p>;
} }