Merge pull request #25193 from gmarek/gather

Automatic merge from submit-queue Fix units in kubemark resource gatherer

Merge pull request #25193 from gmarek/gather
ea367080 · k8s-merge-robot · ca830803 · 78331db7 · ea367080
Commit ea367080 authored May 05, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

resource_usage_gatherer.go test/e2e/framework/resource_usage_gatherer.go +1 -1

No files found.
--- 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