Merge pull request #25193 from gmarek/gather

Automatic merge from submit-queue Fix units in kubemark resource gatherer
2016-05-05 06:16:43 -07:00
parent ca830803f2 78331db78d
commit ea36708020
1 changed files with 1 additions and 1 deletions
--- a/test/e2e/framework/resource_usage_gatherer.go
+++ b/test/e2e/framework/resource_usage_gatherer.go
@@ -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