From 994275aa5593d5d0ce33aa8866c6ea2504cf121e Mon Sep 17 00:00:00 2001
From: shiliang <shiliang@google.com>
Date: Tue, 25 Jul 2017 14:06:00 -0700
Subject: [PATCH 1/2] skip downloading and extracting tarballs and docker
 images when they are preloaded.

---
 cluster/gce/gci/configure-helper.sh |  39 -----
 cluster/gce/gci/configure.sh        | 220 ++++++++++++++++++++--------
 2 files changed, 157 insertions(+), 102 deletions(-)

diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index beaee497d76..a8c3103777b 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -324,7 +324,6 @@ function create-master-pki {
   ln -sf "${APISERVER_SERVER_KEY_PATH}" /etc/srv/kubernetes/server.key
   ln -sf "${APISERVER_SERVER_CERT_PATH}" /etc/srv/kubernetes/server.cert
 
-
   if [[ ! -z "${REQUESTHEADER_CA_CERT:-}" ]]; then
     AGGREGATOR_CA_KEY_PATH="${pki_dir}/aggr_ca.key"
     echo "${AGGREGATOR_CA_KEY}" | base64 --decode > "${AGGREGATOR_CA_KEY_PATH}"
@@ -821,43 +820,6 @@ EOF
   fi
 }
 
-# A helper function for loading a docker image. It keeps trying up to 5 times.
-#
-# $1: Full path of the docker image
-function try-load-docker-image {
-  local -r img=$1
-  echo "Try to load docker image file ${img}"
-  # Temporarily turn off errexit, because we don't want to exit on first failure.
-  set +e
-  local -r max_attempts=5
-  local -i attempt_num=1
-  until timeout 30 docker load -i "${img}"; do
-    if [[ "${attempt_num}" == "${max_attempts}" ]]; then
-      echo "Fail to load docker image file ${img} after ${max_attempts} retries. Exit!!"
-      exit 1
-    else
-      attempt_num=$((attempt_num+1))
-      sleep 5
-    fi
-  done
-  # Re-enable errexit.
-  set -e
-}
-
-# Loads kube-system docker images. It is better to do it before starting kubelet,
-# as kubelet will restart docker daemon, which may interfere with loading images.
-function load-docker-images {
-  echo "Start loading kube-system docker images"
-  local -r img_dir="${KUBE_HOME}/kube-docker-files"
-  if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
-    try-load-docker-image "${img_dir}/kube-apiserver.tar"
-    try-load-docker-image "${img_dir}/kube-controller-manager.tar"
-    try-load-docker-image "${img_dir}/kube-scheduler.tar"
-  else
-    try-load-docker-image "${img_dir}/kube-proxy.tar"
-  fi
-}
-
 # This function assembles the kubelet systemd service file and starts it
 # using systemctl.
 function start-kubelet {
@@ -1890,7 +1852,6 @@ fi
 override-kubectl
 # Run the containerized mounter once to pre-cache the container image.
 assemble-docker-flags
-load-docker-images
 start-kubelet
 
 if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh
index f21db2cb55d..07a70a9a94d 100644
--- a/cluster/gce/gci/configure.sh
+++ b/cluster/gce/gci/configure.sh
@@ -110,16 +110,33 @@ function download-or-bust {
   done
 }
 
+function is-preloaded {
+  local -r key=$1
+  local -r value=$2
+  if [[ -f ${KUBE_HOME}/preload_info ]] && (grep "${key}" "${KUBE_HOME}/preload_info" | grep "${value}" > /dev/null 2>&1);then
+    echo 0
+  else
+    echo 1
+  fi
+}
+
 function split-commas {
   echo $1 | tr "," "\n"
 }
 
 function install-gci-mounter-tools {
   CONTAINERIZED_MOUNTER_HOME="${KUBE_HOME}/containerized_mounter"
+  local -r mounter_tar_sha="8003b798cf33c7f91320cd6ee5cec4fa22244571"
+  preload=$(is-preloaded "mounter" "${mounter_tar_sha}")
+  if [[ preload -eq 0 ]]; then
+    echo "mounter is preloaded."
+    return
+  fi
+
+  echo "Downloading gci mounter tools."
   mkdir -p "${CONTAINERIZED_MOUNTER_HOME}"
   chmod a+x "${CONTAINERIZED_MOUNTER_HOME}"
   mkdir -p "${CONTAINERIZED_MOUNTER_HOME}/rootfs"
-  local -r mounter_tar_sha="8003b798cf33c7f91320cd6ee5cec4fa22244571"
   download-or-bust "${mounter_tar_sha}" "https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar"
   cp "${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty/gci-mounter" "${CONTAINERIZED_MOUNTER_HOME}/mounter"
   chmod a+x "${CONTAINERIZED_MOUNTER_HOME}/mounter"
@@ -138,18 +155,120 @@ function install-node-problem-detector {
       local -r npd_version="v0.4.1"
       local -r npd_sha1="a57a3fe64cab8a18ec654f5cef0aec59dae62568"
   fi
+
+  preload=$(is-preloaded "node-problem-detector" "${npd_sha1}")
+  if [[ preload -eq 0 ]]; then
+    echo "node-problem-detector is preloaded."
+    return
+  fi
+
+  echo "Downloading node problem detector."
   local -r npd_release_path="https://storage.googleapis.com/kubernetes-release"
   local -r npd_tar="node-problem-detector-${npd_version}.tar.gz"
   download-or-bust "${npd_sha1}" "${npd_release_path}/node-problem-detector/${npd_tar}"
   local -r npd_dir="${KUBE_HOME}/node-problem-detector"
   mkdir -p "${npd_dir}"
   tar xzf "${KUBE_HOME}/${npd_tar}" -C "${npd_dir}" --overwrite
-  mv "${npd_dir}/bin"/* "${KUBE_HOME}/bin"
-  chmod a+x "${KUBE_HOME}/bin/node-problem-detector"
+  mv "${npd_dir}/bin"/* "${KUBE_BIN}"
+  chmod a+x "${KUBE_BIN}/node-problem-detector"
   rmdir "${npd_dir}/bin"
   rm -f "${KUBE_HOME}/${npd_tar}"
 }
 
+function install-cni-binaries {
+  #TODO(andyzheng0831): We should make the cni version number as a k8s env variable.
+  local -r cni_tar="cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz"
+  local -r cni_sha1="1d9788b0f5420e1a219aad2cb8681823fc515e7c"
+  preload=$(is-preloaded "${cni_tar}" "${cni_sha1}")
+  if [[ preload -eq 0 ]]; then
+    echo "${cni_tar} is preloaded."
+    return
+  fi
+
+  echo "Downloading cni binaries"
+  download-or-bust "${cni_sha1}" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}"
+  local -r cni_dir="${KUBE_HOME}/cni"
+  mkdir -p "${cni_dir}"
+  tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}" --overwrite
+  mv "${cni_dir}/bin"/* "${KUBE_BIN}"
+  rmdir "${cni_dir}/bin"
+  rm -f "${KUBE_HOME}/${cni_tar}"
+}
+
+function install-kube-manifests {
+  # Put kube-system pods manifests in ${KUBE_HOME}/kube-manifests/.
+  local dst_dir="${KUBE_HOME}/kube-manifests"
+  mkdir -p "${dst_dir}"
+  local -r manifests_tar_urls=( $(split-commas "${KUBE_MANIFESTS_TAR_URL}") )
+  local -r manifests_tar="${manifests_tar_urls[0]##*/}"
+  if [ -n "${KUBE_MANIFESTS_TAR_HASH:-}" ]; then
+    local -r manifests_tar_hash="${KUBE_MANIFESTS_TAR_HASH}"
+  else
+    echo "Downloading k8s manifests sha1 (not found in env)"
+    download-or-bust "" "${manifests_tar_urls[@]/.tar.gz/.tar.gz.sha1}"
+    local -r manifests_tar_hash=$(cat "${manifests_tar}.sha1")
+  fi
+
+  preload=$(is-preloaded "${manifests_tar}" "${manifests_tar_hash}")
+  if [[ preload -eq 0 ]]; then
+    echo "${manifests_tar} is preloaded."
+    return
+  fi
+
+  echo "Downloading k8s manifests tar"
+  download-or-bust "${manifests_tar_hash}" "${manifests_tar_urls[@]}"
+  tar xzf "${KUBE_HOME}/${manifests_tar}" -C "${dst_dir}" --overwrite
+  local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-gcr.io/google_containers}"
+  if [[ "${kube_addon_registry}" != "gcr.io/google_containers" ]]; then
+    find "${dst_dir}" -name \*.yaml -or -name \*.yaml.in | \
+      xargs sed -ri "s@(image:\s.*)gcr.io/google_containers@\1${kube_addon_registry}@"
+    find "${dst_dir}" -name \*.manifest -or -name \*.json | \
+      xargs sed -ri "s@(image\":\s+\")gcr.io/google_containers@\1${kube_addon_registry}@"
+  fi
+  cp "${dst_dir}/kubernetes/gci-trusty/gci-configure-helper.sh" "${KUBE_BIN}/configure-helper.sh"
+  cp "${dst_dir}/kubernetes/gci-trusty/health-monitor.sh" "${KUBE_BIN}/health-monitor.sh"
+
+  rm -f "${KUBE_HOME}/${manifests_tar}"
+  rm -f "${KUBE_HOME}/${manifests_tar}.sha1"
+}
+
+# A helper function for loading a docker image. It keeps trying up to 5 times.
+#
+# $1: Full path of the docker image
+function try-load-docker-image {
+  local -r img=$1
+  echo "Try to load docker image file ${img}"
+  # Temporarily turn off errexit, because we don't want to exit on first failure.
+  set +e
+  local -r max_attempts=5
+  local -i attempt_num=1
+  until timeout 30 docker load -i "${img}"; do
+    if [[ "${attempt_num}" == "${max_attempts}" ]]; then
+      echo "Fail to load docker image file ${img} after ${max_attempts} retries. Exit!!"
+      exit 1
+    else
+      attempt_num=$((attempt_num+1))
+      sleep 5
+    fi
+  done
+  # Re-enable errexit.
+  set -e
+}
+
+# Loads kube-system docker images. It is better to do it before starting kubelet,
+# as kubelet will restart docker daemon, which may interfere with loading images.
+function load-docker-images {
+  echo "Start loading kube-system docker images"
+  local -r img_dir="${KUBE_HOME}/kube-docker-files"
+  if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
+    try-load-docker-image "${img_dir}/kube-apiserver.tar"
+    try-load-docker-image "${img_dir}/kube-controller-manager.tar"
+    try-load-docker-image "${img_dir}/kube-scheduler.tar"
+  else
+    try-load-docker-image "${img_dir}/kube-proxy.tar"
+  fi
+}
+
 # Downloads kubernetes binaries and kube-system manifest tarball, unpacks them,
 # and places them into suitable directories. Files are placed in /home/kubernetes.
 function install-kube-binary-config {
@@ -163,71 +282,48 @@ function install-kube-binary-config {
     download-or-bust "" "${server_binary_tar_urls[@]/.tar.gz/.tar.gz.sha1}"
     local -r server_binary_tar_hash=$(cat "${server_binary_tar}.sha1")
   fi
-  echo "Downloading binary release tar"
-  download-or-bust "${server_binary_tar_hash}" "${server_binary_tar_urls[@]}"
-  tar xzf "${KUBE_HOME}/${server_binary_tar}" -C "${KUBE_HOME}" --overwrite
-  # Copy docker_tag and image files to ${KUBE_HOME}/kube-docker-files.
-  local -r src_dir="${KUBE_HOME}/kubernetes/server/bin"
-  local dst_dir="${KUBE_HOME}/kube-docker-files"
-  mkdir -p "${dst_dir}"
-  cp "${src_dir}/"*.docker_tag "${dst_dir}"
-  if [[ "${KUBERNETES_MASTER:-}" == "false" ]]; then
-    cp "${src_dir}/kube-proxy.tar" "${dst_dir}"
-    if [[ "${ENABLE_NODE_PROBLEM_DETECTOR:-}" == "standalone" ]]; then
-      install-node-problem-detector
-    fi
+
+  preload=$(is-preloaded "${server_binary_tar}" "${server_binary_tar_hash}")
+  if [[ preload -eq 0 ]]; then
+    echo "${server_binary_tar} is preloaded."
   else
-    cp "${src_dir}/kube-apiserver.tar" "${dst_dir}"
-    cp "${src_dir}/kube-controller-manager.tar" "${dst_dir}"
-    cp "${src_dir}/kube-scheduler.tar" "${dst_dir}"
-    cp -r "${KUBE_HOME}/kubernetes/addons" "${dst_dir}"
+    echo "Downloading binary release tar"
+    download-or-bust "${server_binary_tar_hash}" "${server_binary_tar_urls[@]}"
+    tar xzf "${KUBE_HOME}/${server_binary_tar}" -C "${KUBE_HOME}" --overwrite
+    # Copy docker_tag and image files to ${KUBE_HOME}/kube-docker-files.
+    src_dir="${KUBE_HOME}/kubernetes/server/bin"
+    dst_dir="${KUBE_HOME}/kube-docker-files"
+    mkdir -p "${dst_dir}"
+    cp "${src_dir}/"*.docker_tag "${dst_dir}"
+    if [[ "${KUBERNETES_MASTER:-}" == "false" ]]; then
+      cp "${src_dir}/kube-proxy.tar" "${dst_dir}"
+    else
+      cp "${src_dir}/kube-apiserver.tar" "${dst_dir}"
+      cp "${src_dir}/kube-controller-manager.tar" "${dst_dir}"
+      cp "${src_dir}/kube-scheduler.tar" "${dst_dir}"
+      cp -r "${KUBE_HOME}/kubernetes/addons" "${dst_dir}"
+    fi
+    load-docker-images
+    mv "${src_dir}/kubelet" "${KUBE_BIN}"
+    mv "${src_dir}/kubectl" "${KUBE_BIN}"
+
+    mv "${KUBE_HOME}/kubernetes/LICENSES" "${KUBE_HOME}"
+    mv "${KUBE_HOME}/kubernetes/kubernetes-src.tar.gz" "${KUBE_HOME}"
+  fi
+
+  if [[ "${KUBERNETES_MASTER:-}" == "false" ]] && \
+     [[ "${ENABLE_NODE_PROBLEM_DETECTOR:-}" == "standalone" ]]; then
+    install-node-problem-detector
   fi
-  local -r kube_bin="${KUBE_HOME}/bin"
-  mv "${src_dir}/kubelet" "${kube_bin}"
-  mv "${src_dir}/kubectl" "${kube_bin}"
 
   if [[ "${NETWORK_PROVIDER:-}" == "kubenet" ]] || \
      [[ "${NETWORK_PROVIDER:-}" == "cni" ]]; then
-    #TODO(andyzheng0831): We should make the cni version number as a k8s env variable.
-    local -r cni_tar="cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz"
-    local -r cni_sha1="1d9788b0f5420e1a219aad2cb8681823fc515e7c"
-    download-or-bust "${cni_sha1}" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}"
-    local -r cni_dir="${KUBE_HOME}/cni"
-    mkdir -p "${cni_dir}"
-    tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}" --overwrite
-    mv "${cni_dir}/bin"/* "${kube_bin}"
-    rmdir "${cni_dir}/bin"
-    rm -f "${KUBE_HOME}/${cni_tar}"
+    install-cni-binaries
   fi
 
-  mv "${KUBE_HOME}/kubernetes/LICENSES" "${KUBE_HOME}"
-  mv "${KUBE_HOME}/kubernetes/kubernetes-src.tar.gz" "${KUBE_HOME}"
-
   # Put kube-system pods manifests in ${KUBE_HOME}/kube-manifests/.
-  local dst_dir="${KUBE_HOME}/kube-manifests"
-  mkdir -p "${dst_dir}"
-  local -r manifests_tar_urls=( $(split-commas "${KUBE_MANIFESTS_TAR_URL}") )
-  local -r manifests_tar="${manifests_tar_urls[0]##*/}"
-  if [ -n "${KUBE_MANIFESTS_TAR_HASH:-}" ]; then
-    local -r manifests_tar_hash="${KUBE_MANIFESTS_TAR_HASH}"
-  else
-    echo "Downloading k8s manifests sha1 (not found in env)"
-    download-or-bust "" "${manifests_tar_urls[@]/.tar.gz/.tar.gz.sha1}"
-    local -r manifests_tar_hash=$(cat "${manifests_tar}.sha1")
-  fi
-  echo "Downloading k8s manifests tar"
-  download-or-bust "${manifests_tar_hash}" "${manifests_tar_urls[@]}"
-  tar xzf "${KUBE_HOME}/${manifests_tar}" -C "${dst_dir}" --overwrite
-  local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-gcr.io/google_containers}"
-  if [[ "${kube_addon_registry}" != "gcr.io/google_containers" ]]; then
-    find "${dst_dir}" -name \*.yaml -or -name \*.yaml.in | \
-      xargs sed -ri "s@(image:\s.*)gcr.io/google_containers@\1${kube_addon_registry}@"
-    find "${dst_dir}" -name \*.manifest -or -name \*.json | \
-      xargs sed -ri "s@(image\":\s+\")gcr.io/google_containers@\1${kube_addon_registry}@"
-  fi
-  cp "${dst_dir}/kubernetes/gci-trusty/gci-configure-helper.sh" "${KUBE_HOME}/bin/configure-helper.sh"
-  cp "${dst_dir}/kubernetes/gci-trusty/health-monitor.sh" "${KUBE_HOME}/bin/health-monitor.sh"
-  chmod -R 755 "${kube_bin}"
+  install-kube-manifests
+  chmod -R 755 "${KUBE_BIN}"
 
   # Install gci mounter related artifacts to allow mounting storage volumes in GCI
   install-gci-mounter-tools
@@ -236,14 +332,13 @@ function install-kube-binary-config {
   rm -rf "${KUBE_HOME}/kubernetes"
   rm -f "${KUBE_HOME}/${server_binary_tar}"
   rm -f "${KUBE_HOME}/${server_binary_tar}.sha1"
-  rm -f "${KUBE_HOME}/${manifests_tar}"
-  rm -f "${KUBE_HOME}/${manifests_tar}.sha1"
 }
 
 ######### Main Function ##########
 echo "Start to install kubernetes files"
 set-broken-motd
 KUBE_HOME="/home/kubernetes"
+KUBE_BIN="${KUBE_HOME}/bin"
 download-kube-env
 source "${KUBE_HOME}/kube-env"
 if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
@@ -251,4 +346,3 @@ if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
 fi
 install-kube-binary-config
 echo "Done for installing kubernetes files"
-

From f561a299ac24e8a2efab5b564cca1f23fc42a040 Mon Sep 17 00:00:00 2001
From: shiliang <shiliang@google.com>
Date: Mon, 31 Jul 2017 15:57:02 -0700
Subject: [PATCH 2/2] refactor function is-preloaded in configure.sh

---
 cluster/gce/gci/configure.sh | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh
index 07a70a9a94d..db337edcef6 100644
--- a/cluster/gce/gci/configure.sh
+++ b/cluster/gce/gci/configure.sh
@@ -113,11 +113,7 @@ function download-or-bust {
 function is-preloaded {
   local -r key=$1
   local -r value=$2
-  if [[ -f ${KUBE_HOME}/preload_info ]] && (grep "${key}" "${KUBE_HOME}/preload_info" | grep "${value}" > /dev/null 2>&1);then
-    echo 0
-  else
-    echo 1
-  fi
+  grep -qs "${key},${value}" "${KUBE_HOME}/preload_info"
 }
 
 function split-commas {
@@ -127,8 +123,7 @@ function split-commas {
 function install-gci-mounter-tools {
   CONTAINERIZED_MOUNTER_HOME="${KUBE_HOME}/containerized_mounter"
   local -r mounter_tar_sha="8003b798cf33c7f91320cd6ee5cec4fa22244571"
-  preload=$(is-preloaded "mounter" "${mounter_tar_sha}")
-  if [[ preload -eq 0 ]]; then
+  if is-preloaded "mounter" "${mounter_tar_sha}"; then
     echo "mounter is preloaded."
     return
   fi
@@ -156,8 +151,7 @@ function install-node-problem-detector {
       local -r npd_sha1="a57a3fe64cab8a18ec654f5cef0aec59dae62568"
   fi
 
-  preload=$(is-preloaded "node-problem-detector" "${npd_sha1}")
-  if [[ preload -eq 0 ]]; then
+  if is-preloaded "node-problem-detector" "${npd_sha1}"; then
     echo "node-problem-detector is preloaded."
     return
   fi
@@ -179,8 +173,7 @@ function install-cni-binaries {
   #TODO(andyzheng0831): We should make the cni version number as a k8s env variable.
   local -r cni_tar="cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz"
   local -r cni_sha1="1d9788b0f5420e1a219aad2cb8681823fc515e7c"
-  preload=$(is-preloaded "${cni_tar}" "${cni_sha1}")
-  if [[ preload -eq 0 ]]; then
+  if is-preloaded "${cni_tar}" "${cni_sha1}"; then
     echo "${cni_tar} is preloaded."
     return
   fi
@@ -209,8 +202,7 @@ function install-kube-manifests {
     local -r manifests_tar_hash=$(cat "${manifests_tar}.sha1")
   fi
 
-  preload=$(is-preloaded "${manifests_tar}" "${manifests_tar_hash}")
-  if [[ preload -eq 0 ]]; then
+  if is-preloaded "${manifests_tar}" "${manifests_tar_hash}"; then
     echo "${manifests_tar} is preloaded."
     return
   fi
@@ -283,16 +275,15 @@ function install-kube-binary-config {
     local -r server_binary_tar_hash=$(cat "${server_binary_tar}.sha1")
   fi
 
-  preload=$(is-preloaded "${server_binary_tar}" "${server_binary_tar_hash}")
-  if [[ preload -eq 0 ]]; then
+  if is-preloaded "${server_binary_tar}" "${server_binary_tar_hash}"; then
     echo "${server_binary_tar} is preloaded."
   else
     echo "Downloading binary release tar"
     download-or-bust "${server_binary_tar_hash}" "${server_binary_tar_urls[@]}"
     tar xzf "${KUBE_HOME}/${server_binary_tar}" -C "${KUBE_HOME}" --overwrite
     # Copy docker_tag and image files to ${KUBE_HOME}/kube-docker-files.
-    src_dir="${KUBE_HOME}/kubernetes/server/bin"
-    dst_dir="${KUBE_HOME}/kube-docker-files"
+    local -r src_dir="${KUBE_HOME}/kubernetes/server/bin"
+    local dst_dir="${KUBE_HOME}/kube-docker-files"
     mkdir -p "${dst_dir}"
     cp "${src_dir}/"*.docker_tag "${dst_dir}"
     if [[ "${KUBERNETES_MASTER:-}" == "false" ]]; then