new changes

satnam6502 · Feb 19, 2015 · a749efa · a749efa
1 parent 2cc5dd5
commit a749efa
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 63 deletions.
diff --git a/examples/guestbook/guestbook_ns/frontend-controller.json b/examples/guestbook/guestbook_ns/frontend-controller.json
@@ -2,10 +2,9 @@
     "kind": "ReplicationController",
     "apiVersion": "v1beta3",
     "metadata": {
-        "name": "frontend-controller",
+        "name": "frontend",
         "labels": {
-            "name": "frontend",
-            "template": "frontend"
+            "name": "frontend"
         }
     },
     "spec": {
@@ -15,31 +14,23 @@
         },
         "template": {
             "metadata": {
-                "name": "frontend-controller",
+                "name": "frontend",
                 "labels": {
-                    "name": "frontend",
-                    "uses": "redisslave,redis-master",
-                    "template": "frontend"
+                    "name": "frontend"
                 }
             },
             "spec": {
-                "volumes": null,
                 "containers": [
                     {
                         "name": "php-redis",
                         "image": "kubernetes/example-guestbook-php-redis",
                         "ports": [
                             {
-                                "containerPort": 80,
-                                "hostPort": 8000
-                            }
+                                "containerPort": 80
+                           }
                         ]
                     }
-                ],
-                "restartPolicy": {
-                    "always": {}
-                },
-                "dnsPolicy": "ClusterFirst"
+                ]
             }
         }
     }

diff --git a/examples/guestbook/guestbook_ns/frontend_service.json b/examples/guestbook/guestbook_ns/frontend_service.json
@@ -3,15 +3,14 @@
   "apiVersion": "v1beta3",
   "metadata": {
     "name": "frontend",
-    "labels": {},
+    "labels": {"name": "frontend"},
   },
   "spec": {
-    "port": 80,
+    "port": 0,
+    "containerPort": 80,
     "protocol": "TCP",
     "selector": {
       "name": "frontend"
-    },
-    "containerPort": 80,
-    "sessionAffinity": "None"
+    }
   }
 }
diff --git a/examples/guestbook/guestbook_ns/redis-master-service.json b/examples/guestbook/guestbook_ns/redis-master-service.json
@@ -8,12 +8,11 @@
         }
     },
     "spec": {
-        "port": 6379,
+        "port": 10000,
         "containerPort": 6379,
         "protocol": "TCP",
         "selector": {
             "name": "redis-master"
-        },
-        "sessionAffinity": "None"
+        }
     }
 }
diff --git a/examples/guestbook/guestbook_ns/redis-master.json b/examples/guestbook/guestbook_ns/redis-master.json
@@ -1,32 +1,39 @@
 {
+    "kind": "ReplicationController",
     "apiVersion": "v1beta3",
-    "kind": "Pod",
-    "id": "redis-master",
     "metadata": {
         "name": "redis-master",
         "labels": {
-            "name": "redis-master"
+            "name": "redis-master",
+            "template": "redis-master"
         }
     },
     "spec": {
-        "volumes": null,
-        "resources": {},
-        "containers": [
-            {
-                "name": "master",
-                "image": "dockerfile/redis",
-                "ports": [
+        "replicas": 1,
+        "selector": {
+            "name": "redis-master"
+        },
+        "template": {
+            "metadata": {
+                "name": "redis-master",
+                "labels": {
+                    "name": "redis-master"
+                }
+            },
+            "spec": {
+                "containers": [
                     {
-                        "containerPort": 6379,
-                        "hostPort": 6379,
-                        "protocol": "TCP"
+                        "name": "master",
+                        "image": "dockerfile/redis",
+                        "ports": [
+                            {
+                                "containerPort": 6379,
+                                "protocol": "TCP"
+                            }
+                        ]
                     }
                 ]
             }
-        ],
-        "restartPolicy": {
-            "always": {}
         }
     }
 }
-
diff --git a/examples/guestbook/guestbook_ns/redis-slave-controller.json b/examples/guestbook/guestbook_ns/redis-slave-controller.json
@@ -2,44 +2,35 @@
     "kind": "ReplicationController",
     "apiVersion": "v1beta3",
     "metadata": {
-        "name": "redis-slave-controller",
+        "name": "redis-slave",
         "labels": {
-            "name": "redisslave",
-            "template": "redisslave"
+            "name": "redis-slave"
         }
     },
     "spec": {
         "replicas": 2,
         "selector": {
-            "name": "redisslave"
+            "name": "redis-slave"
         },
         "template": {
             "metadata": {
-                "name": "redis-slave-controller",
+                "name": "redis-slave",
                 "labels": {
-                    "name": "redisslave",
-                    "template": "redisslave",
-                    "uses": "redis-master"
+                    "name": "redis-slave"
                 }
             },
             "spec": {
-                "volumes": null,
                 "containers": [
                     {
                         "name": "slave",
                         "image": "brendanburns/redis-slave",
                         "ports": [
                             {
-                                "containerPort": 6379,
-                                "hostPort": 6380
+                                "containerPort": 6379
                             }
                         ]
                     }
-                ],
-                "restartPolicy": {
-                    "always": {}
-                },
-                "dnsPolicy": "ClusterFirst"
+                ]
             }
         }
     }

diff --git a/examples/guestbook/guestbook_ns/redis-slave-service.json b/examples/guestbook/guestbook_ns/redis-slave-service.json
@@ -2,18 +2,17 @@
     "kind": "Service",
     "apiVersion": "v1beta3",
     "metadata": {
-        "name": "redisslave",
+        "name": "redis-slave",
         "labels": {
-            "name": "redisslave"
+            "name": "redis-slave"
         }
     },
     "spec": {
-        "port": 6379,
+        "port": 10001,
         "containerPort": 6379,
         "protocol": "TCP",
         "selector": {
-            "name": "redisslave"
-        },
-        "sessionAffinity": "None"
+            "name": "redis-slave"
+        }
     }
 }