github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16824 from mattmoor/master

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-16 09:12:35 -08:00
parent f8db8f12fd b750d1dddc
commit ebe5649939
19 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/cluster_size_autoscaling.go
View File

@@ -147,7 +147,7 @@ func ReserveCpu(f *Framework, id string, millicores int) {
Name: id,
Namespace: f.Namespace.Name,
Timeout: 10 * time.Minute,
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
Replicas: millicores / 100,
CpuRequest: 100,
}
@@ -161,7 +161,7 @@ func ReserveMemory(f *Framework, id string, megabytes int) {
Name: id,
Namespace: f.Namespace.Name,
Timeout: 10 * time.Minute,
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
Replicas: megabytes / 500,
MemRequest: 500 * 1024 * 1024,
}

2
test/e2e/container_probe.go
View File

@@ -117,7 +117,7 @@ func makePodSpec(readinessProbe, livenessProbe *api.Probe) *api.Pod {
ReadinessProbe: readinessProbe,
}, {
Name: "test-noprobe",
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
},
},
},

2
test/e2e/daemon_restart.go
View File

@@ -208,7 +208,7 @@ var _ = Describe("DaemonRestart", func() {
Client: framework.Client,
Name: rcName,
Namespace: ns,
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
Replicas: numPods,
CreatedPods: &[]*api.Pod{},
}

4
test/e2e/density.go
View File

@@ -186,7 +186,7 @@ var _ = Describe("Density", func() {
expectNoError(err)
defer fileHndl.Close()
config := RCConfig{Client: c,
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
Name: RCName,
Namespace: ns,
PollInterval: itArg.interval,
@@ -316,7 +316,7 @@ var _ = Describe("Density", func() {
}
for i := 1; i <= nodeCount; i++ {
name := additionalPodsPrefix + "-" + strconv.Itoa(i)
go createRunningPod(&wg, c, name, ns, "beta.gcr.io/google_containers/pause:2.0", podLabels)
go createRunningPod(&wg, c, name, ns, "gcr.io/google_containers/pause:2.0", podLabels)
time.Sleep(200 * time.Millisecond)
}
wg.Wait()

2
test/e2e/etcd_failure.go
View File

@@ -47,7 +47,7 @@ var _ = Describe("Etcd failure", func() {
Client: framework.Client,
Name: "baz",
Namespace: framework.Namespace.Name,
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
Replicas: 1,
})).NotTo(HaveOccurred())
})

2
test/e2e/garbage_collector.go
View File

@@ -73,7 +73,7 @@ func createTerminatingPod(f *Framework) (*api.Pod, error) {
Containers: []api.Container{
{
Name: string(uuid),
Image: "beta.gcr.io/google_containers/busybox",
Image: "gcr.io/google_containers/busybox",
},
},
},

2
test/e2e/kubelet.go
View File

@@ -130,7 +130,7 @@ var _ = Describe("kubelet", func() {
Client: framework.Client,
Name: rcName,
Namespace: framework.Namespace.Name,
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
Replicas: totalPods,
})).NotTo(HaveOccurred())
// Perform a sanity check so that we know all desired pods are

2
test/e2e/kubelet_perf.go
View File

@@ -61,7 +61,7 @@ func runResourceTrackingTest(framework *Framework, podsPerNode int, nodeNames se
Client: framework.Client,
Name: rcName,
Namespace: framework.Namespace.Name,
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
Replicas: totalPods,
})).NotTo(HaveOccurred())

4
test/e2e/pods.go
View File

@@ -219,7 +219,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "test",
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
},
},
},
@@ -244,7 +244,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "nginx",
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
Resources: api.ResourceRequirements{
Limits: api.ResourceList{
api.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI),

14
test/e2e/scheduler_predicates.go
View File

@@ -230,7 +230,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: "",
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
},
},
},
@@ -249,7 +249,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: podName,
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
},
},
},
@@ -308,7 +308,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: "",
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
Resources: api.ResourceRequirements{
Limits: api.ResourceList{
"cpu": *resource.NewMilliQuantity(milliCpuPerPod, "DecimalSI"),
@@ -332,7 +332,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: podName,
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
Resources: api.ResourceRequirements{
Limits: api.ResourceList{
"cpu": *resource.NewMilliQuantity(milliCpuPerPod, "DecimalSI"),
@@ -372,7 +372,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: podName,
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
},
},
NodeSelector: map[string]string{
@@ -408,7 +408,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: podName,
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
},
},
},
@@ -446,7 +446,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: labelPodName,
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
},
},
NodeSelector: map[string]string{

2
test/e2e/service.go
View File

@@ -1074,7 +1074,7 @@ func createPodOrFail(c *client.Client, ns, name string, labels map[string]string
Containers: []api.Container{
{
Name: "test",
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
Ports: containerPorts,
},
},

2
test/e2e/service_latency.go
View File

@@ -119,7 +119,7 @@ var _ = Describe("Service endpoints latency", func() {
func runServiceLatencies(f *Framework, inParallel, total int) (output []time.Duration, err error) {
cfg := RCConfig{
Client: f.Client,
Image: "beta.gcr.io/google_containers/pause:2.0",
Image: "gcr.io/google_containers/pause:2.0",
Name: "svc-latency-rc",
Namespace: f.Namespace.Name,
Replicas: 1,