Merge pull request #22265 from wojtek-t/set_request_in_density

Auto commit by PR queue bot

pkg/kubelet/cadvisor/cadvisor_fake.go

@@ -49,7 +49,12 @@ func (c *Fake) DockerContainer(name string, req *cadvisorapi.ContainerInfoReques
 }
 
 func (c *Fake) MachineInfo() (*cadvisorapi.MachineInfo, error) {
-	return new(cadvisorapi.MachineInfo), nil
+	// Simulate a matchin with 1 core and 3.75GB of memory.
+	// We set it to non-zero values to make non-zero-capacity machines in Kubemark.
+	return &cadvisorapi.MachineInfo{
+		NumCores:       1,
+		MemoryCapacity: 4026531840,
+	}, nil
 }
 
 func (c *Fake) VersionInfo() (*cadvisorapi.VersionInfo, error) {

test/e2e/density.go

@@ -232,6 +232,8 @@ var _ = Describe("Density", func() {
 				PollInterval:         itArg.interval,
 				PodStatusFile:        fileHndl,
 				Replicas:             totalPods,
+				CpuRequest:           20,       // 0.02 core
+				MemRequest:           52428800, // 50MB
 				MaxContainerFailures: &MaxContainerFailures,
 			}
 

test/e2e/load.go

@@ -190,6 +190,8 @@ func generateRCConfigsForGroup(c *client.Client, ns, groupName string, size, cou
 			Image:      image,
 			Command:    command,
 			Replicas:   size,
+			CpuRequest: 20,       // 0.02 core
+			MemRequest: 52428800, // 50MB
 		}
 		configs = append(configs, config)
 	}