Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set requests in scalability tests #22265

Merged
merged 1 commit into from
Mar 1, 2016
Merged

Set requests in scalability tests #22265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkg/kubelet/cadvisor/cadvisor_fake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/density.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@ var _ = Describe("Density", func() {
PollInterval: itArg.interval,
PodStatusFile: fileHndl,
Replicas: totalPods,
CpuRequest: 20, // 0.02 core
MemRequest: 52428800, // 50MB
MaxContainerFailures: &MaxContainerFailures,
}

Expand Down
16 changes: 9 additions & 7 deletions test/e2e/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,15 @@ func generateRCConfigsForGroup(c *client.Client, ns, groupName string, size, cou
configs := make([]*RCConfig, 0, count)
for i := 1; i <= count; i++ {
config := &RCConfig{
Client: c,
Name: groupName + "-" + strconv.Itoa(i),
Namespace: ns,
Timeout: 10 * time.Minute,
Image: image,
Command: command,
Replicas: size,
Client: c,
Name: groupName + "-" + strconv.Itoa(i),
Namespace: ns,
Timeout: 10 * time.Minute,
Image: image,
Command: command,
Replicas: size,
CpuRequest: 20, // 0.02 core
MemRequest: 52428800, // 50MB
}
configs = append(configs, config)
}
Expand Down