github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues 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
commit ebe5649939
19 changed files with 30 additions and 30 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 # The set of addons images that should be prepopulated
readonly KUBE_ADDON_PATHS=( readonly KUBE_ADDON_PATHS=(
beta.gcr.io/google_containers/pause:2.0 gcr.io/google_containers/pause:2.0
gcr.io/google_containers/kube-registry-proxy:0.3 gcr.io/google_containers/kube-registry-proxy:0.3
) )

4
build/pause/Makefile
View File

@ -5,9 +5,9 @@ TAG = 2.0
build: build:
./prepare.sh ./prepare.sh
docker build -t beta.gcr.io/google_containers/$(IMAGE):$(TAG) . docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
push: build push: build
gcloud docker --server=beta.gcr.io push beta.gcr.io/google_containers/$(IMAGE):$(TAG) gcloud docker --server=gcr.io push gcr.io/google_containers/$(IMAGE):$(TAG)
all: push all: push

2
cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View File

@ -34,7 +34,7 @@ spec:
volumeMounts: volumeMounts:
- name: influxdb-persistent-storage - name: influxdb-persistent-storage
mountPath: /data mountPath: /data
- image: beta.gcr.io/google_containers/heapster_grafana:v2.1.1 - image: gcr.io/google_containers/heapster_grafana:v2.1.1
name: grafana name: grafana
env: env:
resources: resources:

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

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

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

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

2
docs/admin/kubelet.md
View File

@ -114,7 +114,7 @@ kubelet
--node-status-update-frequency=10s: Specifies how often kubelet posts node status to master. Note: be cautious when changing the constant, it must work with nodeMonitorGracePeriod in nodecontroller. Default: 10s --node-status-update-frequency=10s: Specifies how often kubelet posts node status to master. Note: be cautious when changing the constant, it must work with nodeMonitorGracePeriod in nodecontroller. Default: 10s
--oom-score-adj=-999: The oom-score-adj value for kubelet process. Values must be within the range [-1000, 1000] --oom-score-adj=-999: The oom-score-adj value for kubelet process. Values must be within the range [-1000, 1000]
--pod-cidr="": The CIDR to use for pod IP addresses, only used in standalone mode. In cluster mode, this is obtained from the master. --pod-cidr="": The CIDR to use for pod IP addresses, only used in standalone mode. In cluster mode, this is obtained from the master.
--pod-infra-container-image="beta.gcr.io/google_containers/pause:2.0": The image whose network/ipc namespaces containers in each pod will use. --pod-infra-container-image="gcr.io/google_containers/pause:2.0": The image whose network/ipc namespaces containers in each pod will use.
--port=10250: The port for the Kubelet to serve on. Note that "kubectl logs" will not work if you set this flag. --port=10250: The port for the Kubelet to serve on. Note that "kubectl logs" will not work if you set this flag.
--read-only-port=10255: The read-only port for the Kubelet to serve on with no authentication/authorization (set to 0 to disable) --read-only-port=10255: The read-only port for the Kubelet to serve on with no authentication/authorization (set to 0 to disable)
--really-crash-for-testing[=false]: If true, when panics occur crash. Intended for testing. --really-crash-for-testing[=false]: If true, when panics occur crash. Intended for testing.

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

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

4
test/e2e/cluster_size_autoscaling.go
View File

@ -147,7 +147,7 @@ func ReserveCpu(f *Framework, id string, millicores int) {
Name: id, Name: id,
Namespace: f.Namespace.Name, Namespace: f.Namespace.Name,
Timeout: 10 * time.Minute, Timeout: 10 * time.Minute,
Image: "beta.gcr.io/google_containers/pause:2.0", Image: "gcr.io/google_containers/pause:2.0",
Replicas: millicores / 100, Replicas: millicores / 100,
CpuRequest: 100, CpuRequest: 100,
} }
@ -161,7 +161,7 @@ func ReserveMemory(f *Framework, id string, megabytes int) {
Name: id, Name: id,
Namespace: f.Namespace.Name, Namespace: f.Namespace.Name,
Timeout: 10 * time.Minute, Timeout: 10 * time.Minute,
Image: "beta.gcr.io/google_containers/pause:2.0", Image: "gcr.io/google_containers/pause:2.0",
Replicas: megabytes / 500, Replicas: megabytes / 500,
MemRequest: 500 * 1024 * 1024, 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, ReadinessProbe: readinessProbe,
}, { }, {
Name: "test-noprobe", 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, Client: framework.Client,
Name: rcName, Name: rcName,
Namespace: ns, Namespace: ns,
Image: "beta.gcr.io/google_containers/pause:2.0", Image: "gcr.io/google_containers/pause:2.0",
Replicas: numPods, Replicas: numPods,
CreatedPods: &[]*api.Pod{}, CreatedPods: &[]*api.Pod{},
} }

4
test/e2e/density.go
View File

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

2
test/e2e/etcd_failure.go
View File

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

2
test/e2e/garbage_collector.go
View File

@ -73,7 +73,7 @@ func createTerminatingPod(f *Framework) (*api.Pod, error) {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: string(uuid), 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, Client: framework.Client,
Name: rcName, Name: rcName,
Namespace: framework.Namespace.Name, Namespace: framework.Namespace.Name,
Image: "beta.gcr.io/google_containers/pause:2.0", Image: "gcr.io/google_containers/pause:2.0",
Replicas: totalPods, Replicas: totalPods,
})).NotTo(HaveOccurred()) })).NotTo(HaveOccurred())
// Perform a sanity check so that we know all desired pods are // 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, Client: framework.Client,
Name: rcName, Name: rcName,
Namespace: framework.Namespace.Name, Namespace: framework.Namespace.Name,
Image: "beta.gcr.io/google_containers/pause:2.0", Image: "gcr.io/google_containers/pause:2.0",
Replicas: totalPods, Replicas: totalPods,
})).NotTo(HaveOccurred()) })).NotTo(HaveOccurred())

4
test/e2e/pods.go
View File

@ -219,7 +219,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "test", 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{ Containers: []api.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "beta.gcr.io/google_containers/pause:2.0", Image: "gcr.io/google_containers/pause:2.0",
Resources: api.ResourceRequirements{ Resources: api.ResourceRequirements{
Limits: api.ResourceList{ Limits: api.ResourceList{
api.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI), 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{ Containers: []api.Container{
{ {
Name: "", 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{ Containers: []api.Container{
{ {
Name: podName, 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{ Containers: []api.Container{
{ {
Name: "", Name: "",
Image: "beta.gcr.io/google_containers/pause:2.0", Image: "gcr.io/google_containers/pause:2.0",
Resources: api.ResourceRequirements{ Resources: api.ResourceRequirements{
Limits: api.ResourceList{ Limits: api.ResourceList{
"cpu": *resource.NewMilliQuantity(milliCpuPerPod, "DecimalSI"), "cpu": *resource.NewMilliQuantity(milliCpuPerPod, "DecimalSI"),
@ -332,7 +332,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: podName, Name: podName,
Image: "beta.gcr.io/google_containers/pause:2.0", Image: "gcr.io/google_containers/pause:2.0",
Resources: api.ResourceRequirements{ Resources: api.ResourceRequirements{
Limits: api.ResourceList{ Limits: api.ResourceList{
"cpu": *resource.NewMilliQuantity(milliCpuPerPod, "DecimalSI"), "cpu": *resource.NewMilliQuantity(milliCpuPerPod, "DecimalSI"),
@ -372,7 +372,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: podName, Name: podName,
Image: "beta.gcr.io/google_containers/pause:2.0", Image: "gcr.io/google_containers/pause:2.0",
}, },
}, },
NodeSelector: map[string]string{ NodeSelector: map[string]string{
@ -408,7 +408,7 @@ var _ = Describe("SchedulerPredicates", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: podName, 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{ Containers: []api.Container{
{ {
Name: labelPodName, Name: labelPodName,
Image: "beta.gcr.io/google_containers/pause:2.0", Image: "gcr.io/google_containers/pause:2.0",
}, },
}, },
NodeSelector: map[string]string{ 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{ Containers: []api.Container{
{ {
Name: "test", Name: "test",
Image: "beta.gcr.io/google_containers/pause:2.0", Image: "gcr.io/google_containers/pause:2.0",
Ports: containerPorts, 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) { func runServiceLatencies(f *Framework, inParallel, total int) (output []time.Duration, err error) {
cfg := RCConfig{ cfg := RCConfig{
Client: f.Client, Client: f.Client,
Image: "beta.gcr.io/google_containers/pause:2.0", Image: "gcr.io/google_containers/pause:2.0",
Name: "svc-latency-rc", Name: "svc-latency-rc",
Namespace: f.Namespace.Name, Namespace: f.Namespace.Name,
Replicas: 1, Replicas: 1,