Merge pull request #68 from aaronlevy/quickstart-tweaks

hack/quickstart: minor install tweaks

Author: aaronlevy

hack/quickstart/init-master.sh

@@ -1,6 +1,14 @@
 #!/bin/bash
 set -euo pipefail
 
+REMOTE_HOST=$1
+REMOTE_PORT=${REMOTE_PORT:-22}
+CLUSTER_DIR=${CLUSTER_DIR:-cluster}
+IDENT=${IDENT:-${HOME}/.ssh/id_rsa}
+
+BOOTKUBE_REPO=quay.io/coreos/bootkube
+BOOTKUBE_VERSION=v0.1.0
+
 function usage() {
     echo "USAGE:"
     echo "$0: <remote-host>"
@@ -60,9 +68,8 @@ function init_master_node() {
     systemctl enable etcd2; sudo systemctl start etcd2
     configure_network
 
-    # Start flannel then kubelet
+    # Start flannel
     systemctl enable flanneld; sudo systemctl start flanneld
-    systemctl enable kubelet; sudo systemctl start kubelet
 
     # Render cluster assets
     /usr/bin/rkt run \
@@ -76,6 +83,9 @@ function init_master_node() {
     mkdir -p /etc/kubernetes
     cp /home/core/assets/auth/kubeconfig /etc/kubernetes/
 
+    # Start the kubelet
+    systemctl enable kubelet; sudo systemctl start kubelet
+
     # Start bootkube to launch a self-hosted cluster
     /usr/bin/rkt run \
         --volume home,kind=host,source=/home/core \
@@ -86,14 +96,6 @@ function init_master_node() {
 
 [ "$#" == 1 ] || usage
 
-REMOTE_HOST=$1
-REMOTE_PORT=${REMOTE_PORT:-22}
-CLUSTER_DIR=${CLUSTER_DIR:-cluster}
-IDENT=${IDENT:-${HOME}/.ssh/id_rsa}
-
-BOOTKUBE_REPO=quay.io/coreos/bootkube
-BOOTKUBE_VERSION=v0.1.0
-
 [ -d "${CLUSTER_DIR}" ] && {
     echo "Error: CLUSTER_DIR=${CLUSTER_DIR} already exists"
     exit 1

hack/quickstart/init-worker.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
 set -euo pipefail
 
+REMOTE_HOST=$1
+KUBECONFIG=$2
+REMOTE_PORT=${REMOTE_PORT:-22}
+IDENT=${IDENT:-${HOME}/.ssh/id_rsa}
+MASTER="$(awk '/server:/ {print $2}' ${KUBECONFIG} | awk -F/ '{print $3}' | awk -F: '{print $1}')"
+
 function usage() {
     echo "USAGE:"
     echo "$0: <remote-host> <kube-config>"
@@ -24,7 +30,6 @@ function configure_flannel() {
     }
 }
 
-
 # Initialize a worker node
 function init_worker_node() {
     configure_flannel
@@ -42,12 +47,6 @@ function init_worker_node() {
 
 [ "$#" == 2 ] || usage
 
-REMOTE_HOST=$1
-KUBECONFIG=$2
-REMOTE_PORT=${REMOTE_PORT:-22}
-IDENT=${IDENT:-${HOME}/.ssh/id_rsa}
-
-MASTER="$(awk '/server:/ {print $2}' ${KUBECONFIG} | awk -F/ '{print $3}' | awk -F: '{print $1}')"
 if [ -z "${MASTER}" ]; then
     echo "Could not extract master host from kubeconfig"
     exit 1