Skip to content

K
k3s
Commit ea367080 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #25193 from gmarek/gather

Automatic merge from submit-queue Fix units in kubemark resource gatherer
parents ca830803 78331db7
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
test/e2e/framework/resource_usage_gatherer.go
View file @ ea367080
...@@ -197,7 +197,7 @@ func getKubemarkMasterComponentsResourceUsage() ResourceUsagePerContainer { ...@@ -197,7 +197,7 @@ func getKubemarkMasterComponentsResourceUsage() ResourceUsagePerContainer {
if name != "" { if name != "" {
// Gatherer expects pod_name/container_name format // Gatherer expects pod_name/container_name format
fullName := name + "/" + name fullName := name + "/" + name
result[fullName] = &ContainerResourceUsage{Name: fullName, MemoryWorkingSetInBytes: mem, CPUUsageInCores: cpu} result[fullName] = &ContainerResourceUsage{Name: fullName, MemoryWorkingSetInBytes: mem * 1024, CPUUsageInCores: cpu / 100}
} }
} }
return result return result
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment