Merge pull request #6505 from brendandburns/hyperkube

Docker multi-node

cluster/images/hyperkube/Dockerfile

@@ -5,5 +5,6 @@ RUN apt-get -yy -q install iptables
 COPY hyperkube /hyperkube
 RUN chmod a+rx /hyperkube
 
-COPY master.json /etc/kubernetes/manifests/master.json
 
+COPY master-multi.json /etc/kubernetes/manifests-multi/master.json
+COPY master.json /etc/kubernetes/manifests/master.json

cluster/images/hyperkube/master-multi.json

@@ -0,0 +1,45 @@
+{
+"apiVersion": "v1beta3",
+"kind": "Pod",
+"metadata": {"name":"k8s-master"},
+"spec":{
+  "hostNetwork": true,
+  "containers":[
+    {
+      "name": "controller-manager",
+      "image": "gcr.io/google_containers/hyperkube:v0.14.1",
+      "command": [
+              "/hyperkube",
+              "controller-manager",
+              "--master=127.0.0.1:8080",
+              "--machines=127.0.0.1",
+              "--sync_nodes=true",
+              "--v=2"
+        ]
+    },
+    {
+      "name": "apiserver",
+      "image": "gcr.io/google_containers/hyperkube:v0.14.1",
+      "command": [
+              "/hyperkube",
+              "apiserver",
+              "--portal_net=10.0.0.1/24",
+              "--address=0.0.0.0",
+              "--etcd_servers=http://127.0.0.1:4001",
+              "--cluster_name=kubernetes",
+              "--v=2"
+        ]
+    },
+    {
+      "name": "scheduler",
+      "image": "gcr.io/google_containers/hyperkube:v0.14.1",
+      "command": [
+              "/hyperkube",
+              "scheduler",
+              "--master=127.0.0.1:8080",
+              "--v=2"
+        ]
+    }
+  ]
+ }
+}

cluster/images/hyperkube/master.json

@@ -1,7 +1,7 @@
 {
 "apiVersion": "v1beta3",
 "kind": "Pod",
-"metadata": {"name":"nginx"},
+"metadata": {"name":"k8s-master"},
 "spec":{
   "hostNetwork": true,
   "containers":[