e2e images pulled from gcr.io
This commit is contained in:
parent
3eca536fb7
commit
00b879b4d8
|
|
@ -2,7 +2,7 @@ apiVersion: v1beta1
|
||||||
desiredState:
|
desiredState:
|
||||||
manifest:
|
manifest:
|
||||||
containers:
|
containers:
|
||||||
- image: kubernetes/pause
|
- image: gcr.io/google_containers/pause
|
||||||
name: testpd
|
name: testpd
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: "/testpd"
|
- mountPath: "/testpd"
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ metadata:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: testpd
|
- name: testpd
|
||||||
image: kubernetes/pause
|
image: gcr.io/google_containers/pause
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
# name must match the volume name below
|
# name must match the volume name below
|
||||||
- name: testpd
|
- name: testpd
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
"id": "frontend",
|
"id": "frontend",
|
||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "php-redis",
|
"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}]
|
"ports": [{"name": "http-server", "containerPort": 80}]
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
"id": "redis-master",
|
"id": "redis-master",
|
||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "redis-master",
|
"name": "redis-master",
|
||||||
"image": "dockerfile/redis",
|
"image": "gcr.io/google_containers/redis",
|
||||||
"ports": [{"containerPort": 6379}]
|
"ports": [{"containerPort": 6379}]
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
"id": "redis-slave",
|
"id": "redis-slave",
|
||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "redis-slave",
|
"name": "redis-slave",
|
||||||
"image": "kubernetes/redis-slave:v2",
|
"image": "gcr.io/google_containers/redis-slave:v2",
|
||||||
"ports": [{"containerPort": 6379}]
|
"ports": [{"containerPort": 6379}]
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,8 @@
|
||||||
"id": "invalid-pod",
|
"id": "invalid-pod",
|
||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "kubernetes-serve-hostname",
|
"name": "kubernetes-serve-hostname",
|
||||||
"image": "kubernetes/serve_hostname"
|
"image": "gcr.io/google_containers/serve_hostname"
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
"spec": {
|
"spec": {
|
||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "kubernetes-serve-hostname",
|
"name": "kubernetes-serve-hostname",
|
||||||
"image": "kubernetes/serve_hostname"
|
"image": "gcr.io/google_containers/serve_hostname"
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
"spec": {
|
"spec": {
|
||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "kubernetes-serve-hostname",
|
"name": "kubernetes-serve-hostname",
|
||||||
"image": "kubernetes/serve_hostname",
|
"image": "gcr.io/google_containers/serve_hostname",
|
||||||
"resources": {
|
"resources": {
|
||||||
"limits": {
|
"limits": {
|
||||||
"cpu": "1",
|
"cpu": "1",
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
"id": "valid-pod",
|
"id": "valid-pod",
|
||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "kubernetes-serve-hostname",
|
"name": "kubernetes-serve-hostname",
|
||||||
"image": "kubernetes/serve_hostname",
|
"image": "gcr.io/google_containers/serve_hostname",
|
||||||
"cpu": 1000,
|
"cpu": 1000,
|
||||||
"memory": 1048576
|
"memory": 1048576
|
||||||
}]
|
}]
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ apiVersion: v1beta1
|
||||||
desiredState:
|
desiredState:
|
||||||
manifest:
|
manifest:
|
||||||
containers:
|
containers:
|
||||||
- image: busybox
|
- image: gcr.io/google_containers/busybox
|
||||||
name: liveness
|
name: liveness
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
exec:
|
exec:
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ apiVersion: v1beta1
|
||||||
desiredState:
|
desiredState:
|
||||||
manifest:
|
manifest:
|
||||||
containers:
|
containers:
|
||||||
- image: kubernetes/liveness
|
- image: gcr.io/google_containers/liveness
|
||||||
name: liveness
|
name: liveness
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@ server: server.go
|
||||||
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./server.go
|
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./server.go
|
||||||
|
|
||||||
container: server
|
container: server
|
||||||
docker build -t kubernetes/liveness .
|
docker build -t gcr.io/google_containers/liveness .
|
||||||
|
|
||||||
push: container
|
push: container
|
||||||
docker push kubernetes/liveness
|
gcloud preview docker push gcr.io/google_containers/liveness
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f server
|
rm -f server
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ spec:
|
||||||
- "/bin/sh"
|
- "/bin/sh"
|
||||||
- "-c"
|
- "-c"
|
||||||
- "echo ok > /tmp/health; sleep 10; echo fail > /tmp/health; sleep 600"
|
- "echo ok > /tmp/health; sleep 10; echo fail > /tmp/health; sleep 600"
|
||||||
image: busybox
|
image: gcr.io/google_containers/busybox
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ spec:
|
||||||
containers:
|
containers:
|
||||||
- command:
|
- command:
|
||||||
- "/server"
|
- "/server"
|
||||||
image: kubernetes/liveness
|
image: gcr.io/google_containers/liveness
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: "/healthz"
|
path: "/healthz"
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ $ ./cluster/kubectl.sh rollingupdate update-demo-nautilus --update-period=10s -f
|
||||||
```
|
```
|
||||||
The rollingupdate command in kubectl will do 2 things:
|
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.
|
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.
|
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.
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ desiredState:
|
||||||
manifest:
|
manifest:
|
||||||
containers:
|
containers:
|
||||||
- name: update-demo
|
- name: update-demo
|
||||||
image: kubernetes/update-demo:kitten
|
image: gcr.io/google_containers/update-demo:kitten
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ desiredState:
|
||||||
manifest:
|
manifest:
|
||||||
containers:
|
containers:
|
||||||
- name: update-demo
|
- name: update-demo
|
||||||
image: kubernetes/update-demo:nautilus
|
image: gcr.io/google_containers/update-demo:nautilus
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ spec:
|
||||||
version: kitten
|
version: kitten
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- image: kubernetes/update-demo:kitten
|
- image: gcr.io/google_containers/update-demo:kitten
|
||||||
name: update-demo
|
name: update-demo
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ spec:
|
||||||
version: nautilus
|
version: nautilus
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- image: kubernetes/update-demo:nautilus
|
- image: gcr.io/google_containers/update-demo:nautilus
|
||||||
name: update-demo
|
name: update-demo
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue