From d3d8a81871bd9503eef93ca1914abe0281d76c73 Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Wed, 10 Jun 2015 16:55:16 -0700
Subject: [PATCH] update examples/guestbook-go to v1

---
 examples/guestbook-go/README.md                    | 2 +-
 examples/guestbook-go/guestbook-controller.json    | 7 +++----
 examples/guestbook-go/guestbook-service.json       | 9 ++++-----
 examples/guestbook-go/redis-master-controller.json | 5 ++---
 examples/guestbook-go/redis-master-service.json    | 5 ++---
 examples/guestbook-go/redis-slave-controller.json  | 5 ++---
 examples/guestbook-go/redis-slave-service.json     | 5 ++---
 7 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/examples/guestbook-go/README.md b/examples/guestbook-go/README.md
index 98513313417..45b55a4a440 100644
--- a/examples/guestbook-go/README.md
+++ b/examples/guestbook-go/README.md
@@ -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.
 
-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
 $ kubectl create -f examples/guestbook-go/guestbook-service.json
diff --git a/examples/guestbook-go/guestbook-controller.json b/examples/guestbook-go/guestbook-controller.json
index bcea604bd54..5629330ebc6 100644
--- a/examples/guestbook-go/guestbook-controller.json
+++ b/examples/guestbook-go/guestbook-controller.json
@@ -1,6 +1,6 @@
 {
    "kind":"ReplicationController",
-   "apiVersion":"v1beta3",
+   "apiVersion":"v1",
    "metadata":{
       "name":"guestbook",
       "labels":{
@@ -21,13 +21,12 @@
          "spec":{
             "containers":[
                {
-                  "image":"kubernetes/guestbook:v2",
                   "name":"guestbook",
+                  "image":"kubernetes/guestbook:v2",
                   "ports":[
                      {
                         "name":"http-server",
-                        "containerPort":3000,
-                        "protocol":"TCP"
+                        "containerPort":3000
                      }
                   ]
                }
diff --git a/examples/guestbook-go/guestbook-service.json b/examples/guestbook-go/guestbook-service.json
index 3359efee25a..a53ba10da2d 100644
--- a/examples/guestbook-go/guestbook-service.json
+++ b/examples/guestbook-go/guestbook-service.json
@@ -1,6 +1,6 @@
 {
    "kind":"Service",
-   "apiVersion":"v1beta3",
+   "apiVersion":"v1",
    "metadata":{
       "name":"guestbook",
       "labels":{
@@ -8,16 +8,15 @@
       }
    },
    "spec":{
-      "createExternalLoadBalancer": true,
       "ports": [
          {
            "port":3000,
-           "targetPort":"http-server",
-           "protocol":"TCP"
+           "targetPort":"http-server"
          }
       ],
       "selector":{
          "name":"guestbook"
-      }
+      },
+      "type": "LoadBalancer"
    }
 }
diff --git a/examples/guestbook-go/redis-master-controller.json b/examples/guestbook-go/redis-master-controller.json
index 2ca918e7398..823bcaef92d 100644
--- a/examples/guestbook-go/redis-master-controller.json
+++ b/examples/guestbook-go/redis-master-controller.json
@@ -1,6 +1,6 @@
 {
    "kind":"ReplicationController",
-   "apiVersion":"v1beta3",
+   "apiVersion":"v1",
    "id":"redis-master",
    "metadata":{
       "name":"redis-master",
@@ -30,8 +30,7 @@
                   "ports":[
                      {
                         "name":"redis-server",
-                        "containerPort":6379,
-                        "protocol":"TCP"
+                        "containerPort":6379
                      }
                   ]
                }
diff --git a/examples/guestbook-go/redis-master-service.json b/examples/guestbook-go/redis-master-service.json
index 5aed7d9ff84..3d13bb8a3fe 100644
--- a/examples/guestbook-go/redis-master-service.json
+++ b/examples/guestbook-go/redis-master-service.json
@@ -1,6 +1,6 @@
 {
    "kind":"Service",
-   "apiVersion":"v1beta3",
+   "apiVersion":"v1",
    "metadata":{
       "name":"redis-master",
       "labels":{
@@ -12,8 +12,7 @@
       "ports": [
         {
           "port":6379,
-          "targetPort":"redis-server",
-          "protocol":"TCP"
+          "targetPort":"redis-server"
         }
       ],
       "selector":{
diff --git a/examples/guestbook-go/redis-slave-controller.json b/examples/guestbook-go/redis-slave-controller.json
index 6fabb700889..ab72d589605 100644
--- a/examples/guestbook-go/redis-slave-controller.json
+++ b/examples/guestbook-go/redis-slave-controller.json
@@ -1,6 +1,6 @@
 {
    "kind":"ReplicationController",
-   "apiVersion":"v1beta3",
+   "apiVersion":"v1",
    "id":"redis-slave",
    "metadata":{
       "name":"redis-slave",
@@ -35,8 +35,7 @@
                   "ports":[
                      {
                         "name":"redis-server",
-                        "containerPort":6379,
-                        "protocol":"TCP"
+                        "containerPort":6379
                      }
                   ]
                }
diff --git a/examples/guestbook-go/redis-slave-service.json b/examples/guestbook-go/redis-slave-service.json
index 2eb1fb4ad04..bf3eb81b304 100644
--- a/examples/guestbook-go/redis-slave-service.json
+++ b/examples/guestbook-go/redis-slave-service.json
@@ -1,6 +1,6 @@
 {
    "kind":"Service",
-   "apiVersion":"v1beta3",
+   "apiVersion":"v1",
    "metadata":{
       "name":"redis-slave",
       "labels":{
@@ -12,8 +12,7 @@
       "ports": [
         {
           "port":6379,
-          "targetPort":"redis-server",
-          "protocol":"TCP"
+          "targetPort":"redis-server"
         }
       ],
       "selector":{