github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15138 from mattmoor/limited-beta-rewrite 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-10-10 11:41:34 -07:00
parent 3bd7aafcd2 eeb4eeb17c
commit 8580804f77
13 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/common.sh
View File

@ -101,7 +101,7 @@ readonly KUBE_DOCKER_WRAPPED_BINARIES=(
# The set of addons images that should be prepopulated
readonly KUBE_ADDON_PATHS=(
gcr.io/google_containers/pause:0.8.0
beta.gcr.io/google_containers/pause:2.0
gcr.io/google_containers/kube-registry-proxy:0.3
)

6
build/pause/Makefile
View File

@ -1,13 +1,13 @@
.PHONY: build push
IMAGE = pause
TAG = 0.8.0
TAG = 2.0
build:
./prepare.sh
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
docker build -t beta.gcr.io/google_containers/$(IMAGE):$(TAG) .
push: build
gcloud docker push gcr.io/google_containers/$(IMAGE):$(TAG)
gcloud docker --server=beta.gcr.io push beta.gcr.io/google_containers/$(IMAGE):$(TAG)
all: push

6
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View File

@ -1,10 +1,10 @@
.PHONY: build push
IMAGE = fluentd-elasticsearch
TAG = 1.11
TAG = 1.12
build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
docker build -t beta.gcr.io/google_containers/$(IMAGE):$(TAG) .
push:
gcloud docker push gcr.io/google_containers/$(IMAGE):$(TAG)
gcloud docker --server=beta.gcr.io push beta.gcr.io/google_containers/$(IMAGE):$(TAG)

2
cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
View File

@ -6,7 +6,7 @@ metadata:
spec:
containers:
- name: fluentd-elasticsearch
image: gcr.io/google_containers/fluentd-elasticsearch:1.11
image: beta.gcr.io/google_containers/fluentd-elasticsearch:1.12
resources:
limits:
cpu: 100m

2
pkg/kubelet/dockertools/docker.go
View File

@ -41,7 +41,7 @@ import (
const (
PodInfraContainerName = leaky.PodInfraContainerName
DockerPrefix = "docker://"
PodInfraContainerImage = "gcr.io/google_containers/pause:0.8.0"
PodInfraContainerImage = "beta.gcr.io/google_containers/pause:2.0"
LogSuffix = "log"
)

4
test/e2e/autoscaling.go
View File

@ -133,7 +133,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,
}
@ -147,7 +147,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

@ -147,7 +147,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",
},
},
},
@ -172,7 +172,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

@ -194,7 +194,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",
},
},
},
@ -213,7 +213,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",
},
},
},
@ -274,7 +274,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"),
@ -298,7 +298,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"),
@ -340,7 +340,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{
@ -376,7 +376,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",
},
},
},
@ -414,7 +414,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

@ -1058,7 +1058,7 @@ func createPodOrFail(c *client.Client, ns, name string, labels map[string]string
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,