Merge pull request #7227 from lhuard1A/libvirt-coreos_etcd2

Make the libvirt-coreos cluster use the etcd2 shipped within CoreOS

cluster/libvirt-coreos/util.sh

@@ -26,8 +26,6 @@ export LIBVIRT_DEFAULT_URI=qemu:///system
 readonly POOL=kubernetes
 readonly POOL_PATH="$(cd $ROOT && pwd)/libvirt_storage_pool"
 
-ETCD_VERSION=${ETCD_VERSION:-v2.0.9}
-
 # join <delim> <list...>
 # Concatenates the list elements with the delimiter passed as first parameter
 #
@@ -96,9 +94,6 @@ function destroy-pool {
         virsh vol-delete $vol --pool $POOL
       done
 
-  rm -rf "$POOL_PATH"/etcd/*
-  virsh vol-delete etcd --pool $POOL || true
-
   [[ "$1" == 'keep_base_image' ]] && return
 
   set +e
@@ -146,18 +141,6 @@ function initialize-pool {
       render-template "$ROOT/skydns-rc.yaml"  > "$POOL_PATH/kubernetes/addons/skydns-rc.yaml"
   fi
 
-  mkdir -p "$POOL_PATH/etcd"
-  if [[ ! -f "$ROOT/etcd-${ETCD_VERSION}-linux-amd64.tar.gz" ]]; then
-      wget -P "$ROOT" https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz
-  fi
-  if [[ "$ROOT/etcd-${ETCD_VERSION}-linux-amd64.tar.gz" -nt "$POOL_PATH/etcd/etcd" ]]; then
-      tar -x -C "$POOL_PATH/etcd" -f "$ROOT/etcd-${ETCD_VERSION}-linux-amd64.tar.gz" etcd-${ETCD_VERSION}-linux-amd64
-      rm -rf "$POOL_PATH/etcd/bin/*"
-      mkdir -p "$POOL_PATH/etcd/bin"
-      mv "$POOL_PATH"/etcd/etcd-${ETCD_VERSION}-linux-amd64/{etcd,etcdctl} "$POOL_PATH/etcd/bin"
-      rm -rf "$POOL_PATH/etcd/etcd-${ETCD_VERSION}-linux-amd64"
-  fi
-
   virsh pool-refresh $POOL
 }
 
@@ -200,13 +183,13 @@ function wait-cluster-readiness {
 function kube-up {
   detect-master
   detect-minions
+  get-kubeconfig-bearertoken
   initialize-pool keep_base_image
   initialize-network
 
   readonly ssh_keys="$(cat ~/.ssh/id_*.pub | sed 's/^/  - /')"
   readonly kubernetes_dir="$POOL_PATH/kubernetes"
-  readonly etcd_dir="$POOL_PATH/etcd"
-  readonly discovery=$(curl -s https://discovery.etcd.io/new)
+  readonly discovery=$(curl -s https://discovery.etcd.io/new?size=$(($NUM_MINIONS+1)))
 
   readonly machines=$(join , "${KUBE_MINION_IP_ADDRESSES[@]}")