Merge pull request #374 from aaronlevy/qs-1.5.4

hack/quickstart: bump to bootkube v0.3.11 & k8s v1.5.4

Author: aaronlevy

hack/quickstart/init-master.sh

@@ -9,7 +9,7 @@ SSH_OPTS=${SSH_OPTS:-}
 SELF_HOST_ETCD=${SELF_HOST_ETCD:-false}
 
 BOOTKUBE_REPO=${BOOTKUBE_REPO:-quay.io/coreos/bootkube}
-BOOTKUBE_VERSION=${BOOTKUBE_VERSION:-v0.3.9}
+BOOTKUBE_VERSION=${BOOTKUBE_VERSION:-v0.3.11}
 
 function usage() {
     echo "USAGE:"

hack/quickstart/kubelet.master

@@ -1,6 +1,6 @@
 [Service]
 Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
-Environment=KUBELET_IMAGE_TAG=v1.5.3_coreos.0
+Environment=KUBELET_IMAGE_TAG=v1.5.4_coreos.0
 Environment="RKT_RUN_ARGS=\
 --uuid-file-save=/var/run/kubelet-pod.uuid \
 --volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \

hack/quickstart/kubelet.worker

@@ -1,6 +1,6 @@
 [Service]
 Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
-Environment=KUBELET_IMAGE_TAG=v1.5.3_coreos.0
+Environment=KUBELET_IMAGE_TAG=v1.5.4_coreos.0
 Environment="RKT_RUN_ARGS=\
 --uuid-file-save=/var/run/kubelet-pod.uuid \
 --volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \