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

Move pause and fluentd-elasticsearch to GCR v2.

Browse Source 
This scopes down the initially ambitious PR:
https://github.com/kubernetes/kubernetes/pull/14960 to replace just
`pause` and `fluentd-elasticsearch` to come through `beta.gcr.io`.

The v2 versions have been pushed under new tags, `pause:2.0` and
`fluentd-elastisearch:1.12`.

NOTE: `beta.gcr.io` will still serve images using v1 until they are repushed with v2.  Pulls through `gcr.io` will still work after pushing through `beta.gcr.io`, but will be served over v1 (via compat logic).
This commit is contained in:
Matt Moore
2015-10-05 17:23:17 -07:00
parent b9cfab87e3
commit eeb4eeb17c
13 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/autoscaling.go
View File

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

4
test/e2e/density.go
View File

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

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: "gcr.io/google_containers/pause:go",
Image: "beta.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: "gcr.io/google_containers/pause:go",
Image: "beta.gcr.io/google_containers/pause:2.0",
Replicas: totalPods,
})).NotTo(HaveOccurred())

4
test/e2e/pods.go
View File

@@ -142,7 +142,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "test",
Image: "gcr.io/google_containers/pause",
Image: "beta.gcr.io/google_containers/pause:2.0",
},
},
},
@@ -167,7 +167,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "nginx",
Image: "gcr.io/google_containers/pause",
Image: "beta.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

@@ -208,7 +208,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: "",
Image: "gcr.io/google_containers/pause:go",
Image: "beta.gcr.io/google_containers/pause:2.0",
},
},
},
@@ -227,7 +227,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: podName,
Image: "gcr.io/google_containers/pause:go",
Image: "beta.gcr.io/google_containers/pause:2.0",
},
},
},
@@ -288,7 +288,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: "",
Image: "gcr.io/google_containers/pause:go",
Image: "beta.gcr.io/google_containers/pause:2.0",
Resources: api.ResourceRequirements{
Limits: api.ResourceList{
"cpu": *resource.NewMilliQuantity(milliCpuPerPod, "DecimalSI"),
@@ -312,7 +312,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: podName,
Image: "gcr.io/google_containers/pause:go",
Image: "beta.gcr.io/google_containers/pause:2.0",
Resources: api.ResourceRequirements{
Limits: api.ResourceList{
"cpu": *resource.NewMilliQuantity(milliCpuPerPod, "DecimalSI"),
@@ -354,7 +354,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: podName,
Image: "gcr.io/google_containers/pause:go",
Image: "beta.gcr.io/google_containers/pause:2.0",
},
},
NodeSelector: map[string]string{
@@ -390,7 +390,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: podName,
Image: "gcr.io/google_containers/pause:go",
Image: "beta.gcr.io/google_containers/pause:2.0",
},
},
},
@@ -428,7 +428,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{
{
Name: labelPodName,
Image: "gcr.io/google_containers/pause:go",
Image: "beta.gcr.io/google_containers/pause:2.0",
},
},
NodeSelector: map[string]string{

2
test/e2e/service.go
View File

@@ -1225,7 +1225,7 @@ func addEndpointPodOrFail(c *client.Client, ns, name string, labels map[string]s
Containers: []api.Container{
{
Name: "test",
Image: "gcr.io/google_containers/pause",
Image: "beta.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: "gcr.io/google_containers/pause:1.0",
Image: "beta.gcr.io/google_containers/pause:2.0",
Name: "svc-latency-rc",
Namespace: f.Namespace.Name,
Replicas: 1,