Using the etcd that comes in hyperkube

huggsboson · Dec 7, 2016 · f2e249b · f2e249b
1 parent c33323d
commit f2e249b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/kube-up.sh b/kube-up.sh
@@ -64,14 +64,6 @@ else
 fi
 
 
-echo "Starting etcd"
-docker run \
-    --name=etcd \
-    --net=host \
-    -d \
-    gcr.io/google_containers/etcd:2.2.1 \
-    /usr/local/bin/etcd --listen-client-urls=http://127.0.0.1:4001 --advertise-client-urls=http://127.0.0.1:4001 >/dev/null 2>&1
-
 echo "Starting kubelet"
 docker run \
     --name=kubelet \

diff --git a/manifests-multi/etcd.json b/manifests-multi/etcd.json
@@ -0,0 +1,33 @@
+{
+   "apiVersion": "v1",
+   "kind": "Pod",
+   "metadata": {"name":"k8s-etcd","namespace":"kube-system"},
+   "spec": {
+     "hostNetwork": true,
+     "containers": [
+       {
+         "name": "etcd",
+         "image": "gcr.io/google_containers/etcd-amd64:2.2.5",
+         "command": [
+                 "/usr/local/bin/etcd",
+                 "--listen-client-urls=http://127.0.0.1:4001",
+                 "--advertise-client-urls=http://127.0.0.1:4001",
+                 "--data-dir=/var/etcd/data"
+         ],
+         "volumeMounts": [
+           {
+             "name": "varetcd",
+             "mountPath": "/var/etcd",
+             "readOnly": false
+           }
+         ]
+       }
+     ],
+     "volumes":[
+       {
+         "name": "varetcd",
+         "emptyDir": {}
+       }
+     ]
+   }
+ }