github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25193 from gmarek/gather

Browse Source 
Automatic merge from submit-queue

Fix units in kubemark resource gatherer
This commit is contained in:
k8s-merge-robot 2016-05-05 06:16:43 -07:00
commit ea36708020
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/framework/resource_usage_gatherer.go
View File

@ -197,7 +197,7 @@ func getKubemarkMasterComponentsResourceUsage() ResourceUsagePerContainer {
if name != "" {
// Gatherer expects pod_name/container_name format
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