Merge pull request #428 from yifan-gu/use_local_bootkube

hack/*, RELEASE.md: Use local static binary for quickstart and conformance test.

Author: Yifan Gu

RELEASING.md

@@ -11,6 +11,8 @@
 - Update on-host kubelet versions (`KUBELET_IMAGE_TAG`)
     - hack/multi-node/user-data.sample
     - hack/single-node/user-data.sample
+    - hack/quickstart/kubelet.master
+    - hack/quickstart/kubelet.worker
 
 ### Update conformance test k8s version
 
@@ -54,20 +56,6 @@ Or, manually:
 git checkout vX.Y.Z
 PUSH_IMAGE=true ./build/build-image.sh
 ```
-
-# Updating quickstart guides
-
-Note: the quickstart guides use the release images, so we should not update them until after building/pushing new release.
-
-Update on-host kubelet version (`KUBELET_IMAGE_TAG`)
-
- - hack/quickstart/kubelet.master
- - hack/quickstart/kubelet.worker
-
-Update the bootkube image version (to latest release)
-
-- hack/quickstart/init-master.sh (`BOOTKUBE_VERSION`)
-
 # Updating checkpointer
 
 This only needs to happen when changes have been made to the checkpointer code / container.

hack/quickstart/init-master.sh

@@ -8,9 +8,6 @@ IDENT=${IDENT:-${HOME}/.ssh/id_rsa}
 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.13}
-
 function usage() {
     echo "USAGE:"
     echo "$0: <remote-host>"
@@ -52,11 +49,7 @@ function init_master_node() {
     fi
 
     # Render cluster assets
-    /usr/bin/rkt run \
-        --volume home,kind=host,source=/home/core \
-        --mount volume=home,target=/core \
-        --trust-keys-from-https --net=host ${BOOTKUBE_REPO}:${BOOTKUBE_VERSION} --exec \
-        /bootkube -- render --asset-dir=/core/assets --api-servers=https://${COREOS_PUBLIC_IPV4}:443,https://${COREOS_PRIVATE_IPV4}:443 ${etcd_render_flags}
+    /home/core/bootkube -- render --asset-dir=/home/core/assets --api-servers=https://${COREOS_PUBLIC_IPV4}:443,https://${COREOS_PRIVATE_IPV4}:443 ${etcd_render_flags}
 
     # Move the local kubeconfig into expected location
     chown -R core:core /home/core/assets
@@ -68,13 +61,7 @@ function init_master_node() {
     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 \
-        --mount volume=home,target=/core \
-        --volume manifests,kind=host,source=/etc/kubernetes/manifests \
-        --mount volume=manifests,target=/etc/kubernetes/manifests \
-        --net=host ${BOOTKUBE_REPO}:${BOOTKUBE_VERSION} --exec \
-        /bootkube -- start --asset-dir=/core/assets ${etcd_start_flags}
+    /home/core/bootkube -- start --asset-dir=/home/core/assets ${etcd_start_flags}
 }
 
 [ "$#" == 1 ] || usage
@@ -84,16 +71,19 @@ function init_master_node() {
     exit 1
 }
 
-# This script can execute on a remote host by copying itself + kubelet service unit to remote host.
+# This script can execute on a remote host by copying itself + bootkube binary + kubelet service unit to remote host.
 # After assets are available on the remote host, the script will execute itself in "local" mode.
 if [ "${REMOTE_HOST}" != "local" ]; then
     # Set up the kubelet.service on remote host
     scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} kubelet.master core@${REMOTE_HOST}:/home/core/kubelet.master
     ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} core@${REMOTE_HOST} "sudo mv /home/core/kubelet.master /etc/systemd/system/kubelet.service"
 
+    # Copy bootkube binary to remote host.
+    scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} ../../_output/bin/linux/bootkube core@${REMOTE_HOST}:/home/core/bootkube
+
     # Copy self to remote host so script can be executed in "local" mode
     scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} ${BASH_SOURCE[0]} core@${REMOTE_HOST}:/home/core/init-master.sh
-    ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} core@${REMOTE_HOST} "sudo BOOTKUBE_REPO=${BOOTKUBE_REPO} BOOTKUBE_VERSION=${BOOTKUBE_VERSION} SELF_HOST_ETCD=${SELF_HOST_ETCD} /home/core/init-master.sh local"
+    ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} core@${REMOTE_HOST} "sudo SELF_HOST_ETCD=${SELF_HOST_ETCD} /home/core/init-master.sh local"
 
     # Copy assets from remote host to a local directory. These can be used to launch additional nodes & contain TLS assets
     mkdir ${CLUSTER_DIR}

hack/quickstart/kubelet.master

@@ -1,6 +1,6 @@
 [Service]
 Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
-Environment=KUBELET_IMAGE_TAG=v1.5.6_coreos.0
+Environment=KUBELET_IMAGE_TAG=v1.6.1_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.6_coreos.0
+Environment=KUBELET_IMAGE_TAG=v1.6.1_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/tests/conformance-gce.sh

@@ -14,8 +14,6 @@ set -euo pipefail
 #  - $KEY_FILE:   path to GCE service account keyfile
 #
 # OPTIONAL ENV VARS:
-#  - $BOOTKUBE_REPO:    container repo to use to launch bootkube. Default to value in quickstart/init-master.sh
-#  - $BOOTKUBE_VERSION: container version to use to launch bootkube. Default to value in quickstart/init-master.sh
 #  - $COREOS_VERSION:   CoreOS image version.
 #
 # PROCESS:
@@ -27,8 +25,6 @@ set -euo pipefail
 #     - Use the quickstart init-worker.sh script to join node to kubernetes cluster
 #   - Run conformance tests against the launched cluster
 #
-BOOTKUBE_REPO=${BOOTKUBE_REPO:-}
-BOOTKUBE_VERSION=${BOOTKUBE_VERSION:-}
 COREOS_CHANNEL=${COREOS_CHANNEL:-'coreos-stable'}
 WORKER_COUNT=4
 SELF_HOST_ETCD=${SELF_HOST_ETCD:-false}
@@ -70,7 +66,7 @@ function add_master {
 
     MASTER_IP=$(gcloud compute instances list ${GCE_PREFIX}-m1 --format=json | jq --raw-output '.[].networkInterfaces[].accessConfigs[].natIP')
     cd /build/bootkube/hack/quickstart && SSH_OPTS="-o StrictHostKeyChecking=no" \
-        CLUSTER_DIR=/build/cluster BOOTKUBE_REPO=${BOOTKUBE_REPO} BOOTKUBE_VERSION=${BOOTKUBE_VERSION} SELF_HOST_ETCD=${SELF_HOST_ETCD} ./init-master.sh ${MASTER_IP}
+        CLUSTER_DIR=/build/cluster SELF_HOST_ETCD=${SELF_HOST_ETCD} ./init-master.sh ${MASTER_IP}
 }
 
 function add_workers {
@@ -120,5 +116,5 @@ else
     #TODO(pb): See if there is a way to make the --inherit-env option replace
     #passing all the variables manually. 
     sudo rkt run --insecure-options=image ${RKT_OPTS} docker://golang:1.7.4 --exec /bin/bash -- -c \
-        "IN_CONTAINER=true BOOTKUBE_REPO=${BOOTKUBE_REPO} BOOTKUBE_VERSION=${BOOTKUBE_VERSION} COREOS_CHANNEL=${COREOS_CHANNEL} GCE_PREFIX=${GCE_PREFIX} GCE_SERVICE_ACCOUNT=${GCE_SERVICE_ACCOUNT} GCE_PROJECT=${GCE_PROJECT} SELF_HOST_ETCD=${SELF_HOST_ETCD} /build/bootkube/hack/tests/$(basename $0)"
+        "IN_CONTAINER=true COREOS_CHANNEL=${COREOS_CHANNEL} GCE_PREFIX=${GCE_PREFIX} GCE_SERVICE_ACCOUNT=${GCE_SERVICE_ACCOUNT} GCE_PROJECT=${GCE_PROJECT} SELF_HOST_ETCD=${SELF_HOST_ETCD} /build/bootkube/hack/tests/$(basename $0)"
 fi