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

Merge pull request #2812 from jbeda/guestbook-dup-fix 

Make guestbook handle duplicate entries.
pull/6/head
Brendan Burns 2014-12-09 15:03:48 -08:00
parent adc4c152ec e0f5956e46
commit 122be407aa
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/guestbook/README.md
View File

@ -224,7 +224,7 @@ The pod is described in the file `examples/guestbook/frontend-controller.json`:
"id": "frontendController",
"containers": [{
"name": "php-redis",
"image": "brendanburns/php-redis",
"image": "kubernetes/example-guestbook-php-redis",
"cpu": 100,
"memory": 50000000,
"ports": [{"containerPort": 80, "hostPort": 8000}]
@ -246,7 +246,7 @@ Using this file, you can turn up your frontend with:
$ cluster/kubecfg.sh -c examples/guestbook/frontend-controller.json create replicationControllers
ID Image(s) Selector Replicas
---------- ---------- ---------- ----------
frontendController brendanburns/php-redis name=frontend 3
frontendController kubernetes/example-guestbook-php-redis name=frontend 3
```
Once that's up (it may take ten to thirty seconds to create the pods) you can list the pods in the cluster, to verify that the master, slaves and frontends are running:
@ -258,9 +258,9 @@ ID Image(s) Host
redis-master dockerfile/redis kubernetes-minion-3.c.briandpe-api.internal name=redis-master Running
e4469b52-70e7-11e4-9154-0800279696e1 brendanburns/redis-slave kubernetes-minion-3.c.briandpe-api.internal name=redisslave,replicationController=redisSlaveController,uses=redis-master Running
e446dfc0-70e7-11e4-9154-0800279696e1 brendanburns/redis-slave kubernetes-minion-4.c.briandpe-api.internal name=redisslave,replicationController=redisSlaveController,uses=redis-master Running
6b584847-70ee-11e4-9154-0800279696e1 brendanburns/php-redis kubernetes-minion-3.c.briandpe-api.internal name=frontend,replicationController=frontendController,uses=redisslave,redis-master Running
6b59e6d5-70ee-11e4-9154-0800279696e1 brendanburns/php-redis kubernetes-minion-2.c.briandpe-api.internal name=frontend,replicationController=frontendController,uses=redisslave,redis-master Running
6b57a25d-70ee-11e4-9154-0800279696e1 brendanburns/php-redis kubernetes-minion-1.c.briandpe-api.internal name=frontend,replicationController=frontendController,uses=redisslave,redis-master Running
6b584847-70ee-11e4-9154-0800279696e1 kubernetes/example-guestbook-php-redis kubernetes-minion-3.c.briandpe-api.internal name=frontend,replicationController=frontendController,uses=redisslave,redis-master Running
6b59e6d5-70ee-11e4-9154-0800279696e1 kubernetes/example-guestbook-php-redis kubernetes-minion-2.c.briandpe-api.internal name=frontend,replicationController=frontendController,uses=redisslave,redis-master Running
6b57a25d-70ee-11e4-9154-0800279696e1 kubernetes/example-guestbook-php-redis kubernetes-minion-1.c.briandpe-api.internal name=frontend,replicationController=frontendController,uses=redisslave,redis-master Running
```
You will see a single redis master pod, two redis slaves, and three frontend pods.

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

@ -12,7 +12,7 @@
"id": "frontendController",
"containers": [{
"name": "php-redis",
"image": "brendanburns/php-redis",
"image": "kubernetes/example-guestbook-php-redis",
"cpu": 100,
"memory": 50000000,
"ports": [{"containerPort": 80, "hostPort": 8000}]

2
examples/guestbook/php-redis/index.html
View File

@ -16,7 +16,7 @@
</fieldset>
</form>
<div>
<div ng-repeat="msg in messages">
<div ng-repeat="msg in messages track by $index">
{{msg}}
</div>
</div>