Merge pull request #9643 from caesarxuchao/guestbook-go-example-v1

update examples/guestbook-go to v1
This commit is contained in:
Abhi Shah 2015-06-11 14:06:35 -07:00
commit 0b2eda1b2d
7 changed files with 16 additions and 22 deletions

View File

@ -154,7 +154,7 @@ You will see a single redis master pod, two redis slaves, and three guestbook po
### Step Six: Create the guestbook service. ### Step Six: Create the guestbook service.
Just like the others, you want a service to group your guestbook pods. The service specification for the guestbook is in `examples/guestbook-go/guestbook-service.json`. There's a twist this time - because we want it to be externally visible, we set the `createExternalLoadBalancer` flag on the service. Just like the others, you want a service to group your guestbook pods. The service specification for the guestbook is in `examples/guestbook-go/guestbook-service.json`. There's a twist this time - because we want it to be externally visible, we set `"type": "LoadBalancer"` for the service.
```shell ```shell
$ kubectl create -f examples/guestbook-go/guestbook-service.json $ kubectl create -f examples/guestbook-go/guestbook-service.json

View File

@ -1,6 +1,6 @@
{ {
"kind":"ReplicationController", "kind":"ReplicationController",
"apiVersion":"v1beta3", "apiVersion":"v1",
"metadata":{ "metadata":{
"name":"guestbook", "name":"guestbook",
"labels":{ "labels":{
@ -21,13 +21,12 @@
"spec":{ "spec":{
"containers":[ "containers":[
{ {
"image":"kubernetes/guestbook:v2",
"name":"guestbook", "name":"guestbook",
"image":"kubernetes/guestbook:v2",
"ports":[ "ports":[
{ {
"name":"http-server", "name":"http-server",
"containerPort":3000, "containerPort":3000
"protocol":"TCP"
} }
] ]
} }

View File

@ -1,6 +1,6 @@
{ {
"kind":"Service", "kind":"Service",
"apiVersion":"v1beta3", "apiVersion":"v1",
"metadata":{ "metadata":{
"name":"guestbook", "name":"guestbook",
"labels":{ "labels":{
@ -8,16 +8,15 @@
} }
}, },
"spec":{ "spec":{
"createExternalLoadBalancer": true,
"ports": [ "ports": [
{ {
"port":3000, "port":3000,
"targetPort":"http-server", "targetPort":"http-server"
"protocol":"TCP"
} }
], ],
"selector":{ "selector":{
"name":"guestbook" "name":"guestbook"
} },
"type": "LoadBalancer"
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"kind":"ReplicationController", "kind":"ReplicationController",
"apiVersion":"v1beta3", "apiVersion":"v1",
"id":"redis-master", "id":"redis-master",
"metadata":{ "metadata":{
"name":"redis-master", "name":"redis-master",
@ -30,8 +30,7 @@
"ports":[ "ports":[
{ {
"name":"redis-server", "name":"redis-server",
"containerPort":6379, "containerPort":6379
"protocol":"TCP"
} }
] ]
} }

View File

@ -1,6 +1,6 @@
{ {
"kind":"Service", "kind":"Service",
"apiVersion":"v1beta3", "apiVersion":"v1",
"metadata":{ "metadata":{
"name":"redis-master", "name":"redis-master",
"labels":{ "labels":{
@ -12,8 +12,7 @@
"ports": [ "ports": [
{ {
"port":6379, "port":6379,
"targetPort":"redis-server", "targetPort":"redis-server"
"protocol":"TCP"
} }
], ],
"selector":{ "selector":{

View File

@ -1,6 +1,6 @@
{ {
"kind":"ReplicationController", "kind":"ReplicationController",
"apiVersion":"v1beta3", "apiVersion":"v1",
"id":"redis-slave", "id":"redis-slave",
"metadata":{ "metadata":{
"name":"redis-slave", "name":"redis-slave",
@ -35,8 +35,7 @@
"ports":[ "ports":[
{ {
"name":"redis-server", "name":"redis-server",
"containerPort":6379, "containerPort":6379
"protocol":"TCP"
} }
] ]
} }

View File

@ -1,6 +1,6 @@
{ {
"kind":"Service", "kind":"Service",
"apiVersion":"v1beta3", "apiVersion":"v1",
"metadata":{ "metadata":{
"name":"redis-slave", "name":"redis-slave",
"labels":{ "labels":{
@ -12,8 +12,7 @@
"ports": [ "ports": [
{ {
"port":6379, "port":6379,
"targetPort":"redis-server", "targetPort":"redis-server"
"protocol":"TCP"
} }
], ],
"selector":{ "selector":{