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

Add more types for ObjectMetricStatus

Browse Source 
Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
Alex Andreev 2023-01-16 15:36:42 +03:00
parent ecdf6667cf
commit 25b594de7e
2 changed files with 64 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/common/k8s-api/__tests__/horizontal-pod-autoscaler.api.test.ts
View File

@ -51,6 +51,45 @@ describe("HorizontalPodAutoscalerApi", () => {
expect(hpa.getMetricValues(hpa.getMetrics()[0])).toEqual("unknown / 50%");
});
it("should return correct resource metrics with current metrics", () => {
const hpa = new HorizontalPodAutoscaler({
...hpaV2,
spec: {
...hpaV2.spec,
metrics: [
{
type: HpaMetricType.Resource,
resource: {
name: "cpu",
target: {
type: "Utilization",
averageUtilization: 50
}
}
}
]
},
status: {
currentReplicas: 1,
desiredReplicas: 10,
currentMetrics: [
{
type: HpaMetricType.Resource,
resource: {
name: "cpu",
current: {
averageValue: "100m",
averageUtilization: 10
}
}
}
],
}
});
expect(hpa.getMetricValues(hpa.getMetrics()[0])).toEqual("10% / 50%");
});
it("should return correct container resource metrics", () => {
const hpa = new HorizontalPodAutoscaler(
{

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

@ -94,6 +94,7 @@ export interface ResourceMetricSource {
// autoscaling/v2
target?: {
averageUtilization?: number;
averageValue?: string;
type?: string;
}
}
@ -151,9 +152,18 @@ export interface ExternalMetricStatus {
export interface ObjectMetricStatus {
averageValue?: string;
currentValue?: string;
metricName: string;
metricName?: string;
selector?: LabelSelector;
target: CrossVersionObjectReference;
// autoscaling/v2
metric?: {
name?: string;
},
current: {
type?: string;
value?: string;
};
describedObject?: CrossVersionObjectReference;
}
export interface PodsMetricStatus {
@ -164,8 +174,14 @@ export interface PodsMetricStatus {
export interface ResourceMetricStatus {
currentAverageUtilization?: number;
currentAverageValue: string;
currentAverageValue?: string;
name: string;
// autoscaling/v2
current?: {
averageUtilization?: number;
averageValue?: string;
}
}
export interface BaseHorizontalPodAutoscalerMetricStatus {
@ -325,23 +341,15 @@ function getMetricName(metric: HorizontalPodAutoscalerMetricSpec | HorizontalPod
}
function getResourceMetricValue(currentMetric: ResourceMetricStatus | undefined, targetMetric: ResourceMetricSource): MetricCurrentTarget {
let target = "unknown";
if (targetMetric.target) {
target = targetMetric.target.averageUtilization ? `${targetMetric.target.averageUtilization}%` : "unknown";
} else {
target = typeof targetMetric?.targetAverageUtilization === "number"
? `${targetMetric.targetAverageUtilization}%`
: targetMetric?.targetAverageValue ?? "unknown";
}
return {
current: (
typeof currentMetric?.currentAverageUtilization === "number"
? `${currentMetric.currentAverageUtilization}%`
: currentMetric?.currentAverageValue
typeof currentMetric?.current?.averageUtilization === "number"
? `${currentMetric.current?.averageUtilization}%`
: currentMetric?.current?.averageValue
),
target,
target: typeof targetMetric?.target?.averageUtilization === "number"
? `${targetMetric.target.averageUtilization}%`
: targetMetric?.target?.averageValue ?? "unknown"
};
}