e2e images pulled from gcr.io

This commit is contained in:
Jeff Lowdermilk
2015-03-31 10:25:20 -07:00
parent 506887515d
commit 2d8e93f8b4
33 changed files with 48 additions and 48 deletions

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"

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

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}]
}]
}

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}]
}]
}

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}]
}]
}

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"
}]
}
}
}
}

View File

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

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",

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
}]

View File

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

View File

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

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

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:

View File

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

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.

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

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

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

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