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

e2e images pulled from gcr.io

pull/6/head
Jeff Lowdermilk 2015-03-31 10:25:20 -07:00
parent 506887515d
commit 2d8e93f8b4
33 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/for-demos/serve_hostname/Makefile
View File

@ -6,11 +6,11 @@ serve_hostname: serve_hostname.go
CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' ./serve_hostname.go
container: serve_hostname
sudo docker build -t gcr.io/google-containers/serve_hostname:$(TAG) .
sudo docker tag gcr.io/google-containers/serve_hostname:$(TAG) gcr.io/_b_k8s_authenticated_test/serve_hostname:$(TAG)
sudo docker build -t gcr.io/google_containers/serve_hostname:$(TAG) .
sudo docker tag gcr.io/google_containers/serve_hostname:$(TAG) gcr.io/_b_k8s_authenticated_test/serve_hostname:$(TAG)
push:
gcloud preview docker push gcr.io/google-containers/serve_hostname:$(TAG)
gcloud preview docker push gcr.io/google_containers/serve_hostname:$(TAG)
gcloud preview docker push gcr.io/_b_k8s_authenticated_test/serve_hostname:$(TAG)
clean:

4
contrib/for-demos/test-webserver/Makefile
View File

@ -4,10 +4,10 @@ test-webserver: test-webserver.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./test-webserver.go
container: test-webserver
sudo docker build -t kubernetes/test-webserver .
sudo docker build -t gcr.io/google_containers/test-webserver .
push: container
sudo docker push kubernetes/test-webserver
gcloud preview docker push gcr.io/google_containers/test-webserver
clean:
rm -f test-webserver

2
examples/gce-pd/testpd.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v1beta1
desiredState:
manifest:
containers:
- image: kubernetes/pause
- image: gcr.io/google_containers/pause
name: testpd
volumeMounts:
- mountPath: "/testpd"

2
examples/gce-pd/v1beta3/testpd.yaml
View File

@ -7,7 +7,7 @@ metadata:
spec:
containers:
- name: testpd
image: kubernetes/pause
image: gcr.io/google_containers/pause
volumeMounts:
# name must match the volume name below
- name: testpd

2
examples/guestbook/frontend-controller.json
View File

@ -12,7 +12,7 @@
"id": "frontend",
"containers": [{
"name": "php-redis",
"image": "kubernetes/example-guestbook-php-redis:v2",
"image": "gcr.io/google_containers/example-guestbook-php-redis:v2",
"ports": [{"name": "http-server", "containerPort": 80}]
}]
}

2
examples/guestbook/redis-master-controller.json
View File

@ -12,7 +12,7 @@
"id": "redis-master",
"containers": [{
"name": "redis-master",
"image": "dockerfile/redis",
"image": "gcr.io/google_containers/redis",
"ports": [{"containerPort": 6379}]
}]
}

2
examples/guestbook/redis-slave-controller.json
View File

@ -12,7 +12,7 @@
"id": "redis-slave",
"containers": [{
"name": "redis-slave",
"image": "kubernetes/redis-slave:v2",
"image": "gcr.io/google_containers/redis-slave:v2",
"ports": [{"containerPort": 6379}]
}]
}

4
examples/limitrange/invalid-pod.json
View File

@ -11,8 +11,8 @@
"id": "invalid-pod",
"containers": [{
"name": "kubernetes-serve-hostname",
"image": "kubernetes/serve_hostname"
"image": "gcr.io/google_containers/serve_hostname"
}]
}
}
}
}

2
examples/limitrange/v1beta3/invalid-pod.json
View File

@ -10,7 +10,7 @@
"spec": {
"containers": [{
"name": "kubernetes-serve-hostname",
"image": "kubernetes/serve_hostname"
"image": "gcr.io/google_containers/serve_hostname"
}]
}
}

2
examples/limitrange/v1beta3/valid-pod.json
View File

@ -10,7 +10,7 @@
"spec": {
"containers": [{
"name": "kubernetes-serve-hostname",
"image": "kubernetes/serve_hostname",
"image": "gcr.io/google_containers/serve_hostname",
"resources": {
"limits": {
"cpu": "1",

2
examples/limitrange/valid-pod.json
View File

@ -11,7 +11,7 @@
"id": "valid-pod",
"containers": [{
"name": "kubernetes-serve-hostname",
"image": "kubernetes/serve_hostname",
"image": "gcr.io/google_containers/serve_hostname",
"cpu": 1000,
"memory": 1048576
}]

2
examples/liveness/exec-liveness.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v1beta1
desiredState:
manifest:
containers:
- image: busybox
- image: gcr.io/google_containers/busybox
name: liveness
livenessProbe:
exec:

2
examples/liveness/http-liveness.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v1beta1
desiredState:
manifest:
containers:
- image: kubernetes/liveness
- image: gcr.io/google_containers/liveness
name: liveness
livenessProbe:
httpGet:

4
examples/liveness/image/Makefile
View File

@ -4,10 +4,10 @@ server: server.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./server.go
container: server
docker build -t kubernetes/liveness .
docker build -t gcr.io/google_containers/liveness .
push: container
docker push kubernetes/liveness
gcloud preview docker push gcr.io/google_containers/liveness
clean:
rm -f server

2
examples/liveness/v1beta3/exec-liveness.yaml
View File

@ -18,7 +18,7 @@ spec:
- "/bin/sh"
- "-c"
- "echo ok > /tmp/health; sleep 10; echo fail > /tmp/health; sleep 600"
image: busybox
image: gcr.io/google_containers/busybox
livenessProbe:
exec:
command:

2
examples/liveness/v1beta3/http-liveness.yaml
View File

@ -16,7 +16,7 @@ spec:
containers:
- command:
- "/server"
image: kubernetes/liveness
image: gcr.io/google_containers/liveness
livenessProbe:
httpGet:
path: "/healthz"

2
examples/update-demo/README.md
View File

@ -65,7 +65,7 @@ $ ./cluster/kubectl.sh rollingupdate update-demo-nautilus --update-period=10s -f
```
The rollingupdate command in kubectl will do 2 things:
1. Create a new replication controller with a pod template that uses the new image (`kubernetes/update-demo:kitten`)
1. Create a new replication controller with a pod template that uses the new image (`gcr.io/google_containers/update-demo:kitten`)
2. Resize the old and new replication controllers until the new controller replaces the old. This will kill the current pods one at a time, spinnning up new ones to replace them.
Watch the [demo website](http://localhost:8001/static/index.html), it will update one pod every 10 seconds until all of the pods have the new image.

2
examples/update-demo/v1beta1/kitten-rc.yaml
View File

@ -10,7 +10,7 @@ desiredState:
manifest:
containers:
- name: update-demo
image: kubernetes/update-demo:kitten
image: gcr.io/google_containers/update-demo:kitten
ports:
- containerPort: 80
protocol: TCP

2
examples/update-demo/v1beta1/nautilus-rc.yaml
View File

@ -11,7 +11,7 @@ desiredState:
manifest:
containers:
- name: update-demo
image: kubernetes/update-demo:nautilus
image: gcr.io/google_containers/update-demo:nautilus
ports:
- containerPort: 80
protocol: TCP

2
examples/update-demo/v1beta3/kitten-rc.yaml
View File

@ -13,7 +13,7 @@ spec:
version: kitten
spec:
containers:
- image: kubernetes/update-demo:kitten
- image: gcr.io/google_containers/update-demo:kitten
name: update-demo
ports:
- containerPort: 80

2
examples/update-demo/v1beta3/nautilus-rc.yaml
View File

@ -14,7 +14,7 @@ spec:
version: nautilus
spec:
containers:
- image: kubernetes/update-demo:nautilus
- image: gcr.io/google_containers/update-demo:nautilus
name: update-demo
ports:
- containerPort: 80

4
test/e2e/density.go
View File

@ -218,7 +218,7 @@ var _ = Describe("Density", func() {
}
It(name, func() {
RCName = "my-hostname-density" + strconv.Itoa(count) + "-" + string(util.NewUUID())
RunRC(c, RCName, ns, "kubernetes/pause:go", count*minionCount)
RunRC(c, RCName, ns, "gcr.io/google_containers/pause:go", count*minionCount)
})
}
@ -231,7 +231,7 @@ var _ = Describe("Density", func() {
defer wg.Done()
for i := 0; i < 10; i++ {
name := "my-hostname-thrash-" + string(util.NewUUID())
RunRC(c, name, ns, "kubernetes/pause:go", 10*minionCount)
RunRC(c, name, ns, "gcr.io/google_containers/pause:go", 10*minionCount)
}
}()
}

2
test/e2e/docker_containers.go
View File

@ -85,7 +85,7 @@ func entrypointTestPod() *api.Pod {
Containers: []api.Container{
{
Name: testContainerName,
Image: "kubernetes/eptest:0.1",
Image: "gcr.io/google_containers/eptest:0.1",
},
},
RestartPolicy: api.RestartPolicyNever,

2
test/e2e/es_cluster_logging.go
View File

@ -198,7 +198,7 @@ func ClusterLevelLoggingWithElasticsearch(c *client.Client) {
Containers: []api.Container{
{
Name: "synth-logger",
Image: "ubuntu:14.04",
Image: "gcr.io/google_containers/ubuntu:14.04",
Command: []string{"bash", "-c", fmt.Sprintf("i=0; while ((i < %d)); do echo \"%d %s $i %s\"; i=$(($i+1)); done", countTo, i, taintName, podName)},
},
},

2
test/e2e/events.go
View File

@ -64,7 +64,7 @@ var _ = Describe("Events", func() {
Containers: []api.Container{
{
Name: "p",
Image: "kubernetes/serve_hostname",
Image: "gcr.io/google_containers/serve_hostname",
Ports: []api.ContainerPort{{ContainerPort: 80}},
},
},

4
test/e2e/kubectl.go
View File

@ -30,8 +30,8 @@ import (
)
const (
nautilusImage = "kubernetes/update-demo:nautilus"
kittenImage = "kubernetes/update-demo:kitten"
nautilusImage = "gcr.io/google_containers/update-demo:nautilus"
kittenImage = "gcr.io/google_containers/update-demo:kitten"
updateDemoSelector = "name=update-demo"
updateDemoContainer = "update-demo"
frontendSelector = "name=frontend"

2
test/e2e/networking.go
View File

@ -116,7 +116,7 @@ var _ = Describe("Networking", func() {
Containers: []api.Container{
{
Name: "webserver",
Image: "kubernetes/nettest:1.1",
Image: "gcr.io/google_containers/nettest:1.1",
Args: []string{
"-service=" + name,
fmt.Sprintf("-peers=%d", peers),

2
test/e2e/pd.go
View File

@ -212,7 +212,7 @@ func testPDPod(diskName, targetHost string, readOnly bool) *api.Pod {
Containers: []api.Container{
{
Name: "testpd",
Image: "kubernetes/pause",
Image: "gcr.io/google_containers/pause",
VolumeMounts: []api.VolumeMount{
{
Name: "testpd",

12
test/e2e/pods.go
View File

@ -107,7 +107,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "nginx",
Image: "dockerfile/nginx",
Image: "gcr.io/google_containers/nginx",
Ports: []api.ContainerPort{{ContainerPort: 80}},
LivenessProbe: &api.Probe{
Handler: api.Handler{
@ -207,7 +207,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "nginx",
Image: "dockerfile/nginx",
Image: "gcr.io/google_containers/nginx",
Ports: []api.ContainerPort{{ContainerPort: 80}},
LivenessProbe: &api.Probe{
Handler: api.Handler{
@ -277,7 +277,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "srv",
Image: "kubernetes/serve_hostname",
Image: "gcr.io/google_containers/serve_hostname",
Ports: []api.ContainerPort{{ContainerPort: 9376}},
},
},
@ -332,7 +332,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "env3cont",
Image: "busybox",
Image: "gcr.io/google_containers/busybox",
Command: []string{"sh", "-c", "env"},
},
},
@ -361,7 +361,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "liveness",
Image: "busybox",
Image: "gcr.io/google_containers/busybox",
Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 10; echo fail >/tmp/health; sleep 600"},
LivenessProbe: &api.Probe{
Handler: api.Handler{
@ -387,7 +387,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "liveness",
Image: "kubernetes/liveness",
Image: "gcr.io/google_containers/liveness",
Command: []string{"/server"},
LivenessProbe: &api.Probe{
Handler: api.Handler{

2
test/e2e/rc.go
View File

@ -40,7 +40,7 @@ var _ = Describe("ReplicationController", func() {
})
It("should serve a basic image on each replica with a public image", func() {
ServeImageOrFail(c, "basic", "kubernetes/serve_hostname:1.1")
ServeImageOrFail(c, "basic", "gcr.io/google_containers/serve_hostname:1.1")
})
It("should serve a basic image on each replica with a private image", func() {

2
test/e2e/secrets.go
View File

@ -84,7 +84,7 @@ var _ = Describe("Secrets", func() {
Containers: []api.Container{
{
Name: "catcont",
Image: "busybox",
Image: "gcr.io/google_containers/busybox",
Command: []string{"sh", "-c", "cat /etc/secret-volume/data-1"},
VolumeMounts: []api.VolumeMount{
{

8
test/e2e/service.go
View File

@ -91,7 +91,7 @@ var _ = Describe("Services", func() {
Containers: []api.Container{
{
Name: "webserver",
Image: "kubernetes/test-webserver",
Image: "gcr.io/google_containers/test-webserver",
VolumeMounts: []api.VolumeMount{
{
Name: "results",
@ -101,7 +101,7 @@ var _ = Describe("Services", func() {
},
{
Name: "pinger",
Image: "busybox",
Image: "gcr.io/google_containers/busybox",
Command: []string{"sh", "-c", probeCmd},
VolumeMounts: []api.VolumeMount{
{
@ -306,7 +306,7 @@ var _ = Describe("Services", func() {
Containers: []api.Container{
{
Name: "webserver",
Image: "kubernetes/test-webserver",
Image: "gcr.io/google_containers/test-webserver",
},
},
},
@ -454,7 +454,7 @@ func addEndpointPodOrFail(c *client.Client, ns, name string, labels map[string]s
Containers: []api.Container{
{
Name: "test",
Image: "kubernetes/pause",
Image: "gcr.io/google_containers/pause",
Ports: []api.ContainerPort{{ContainerPort: 80}},
},
},

2
test/soak/serve_hostnames/serve_hostnames.go
View File

@ -161,7 +161,7 @@ func main() {
Containers: []api.Container{
{
Name: "serve-hostname",
Image: "gcr.io/google-containers/serve_hostname:1.1",
Image: "gcr.io/google_containers/serve_hostname:1.1",
Ports: []api.ContainerPort{{ContainerPort: 9376}},
},
},