Merge pull request #66089 from Random-Liu/automated-cherry-pick-of-#62743-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #62743: Fix NPD preload. Cherry pick of #62743 on release-1.10. #62743: Fix NPD preload. We need to cherry-pick this because node startup time on GCE slows down for 10 seconds without this. /cc @MaciekPytel @yujuhong @mwielgus

Merge pull request #66089 from Random-Liu/automated-cherry-pick-of-#62743-upstream-release-1.10
f7f48f22 · Kubernetes Submit Queue · GitHub · dd82356b · 5a9f4666 · f7f48f22
Unverified Commit f7f48f22 authored Jul 13, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

configure.sh cluster/gce/gci/configure.sh +2 -2

No files found.
--- a/cluster/gce/gci/configure.sh
+++ b/cluster/gce/gci/configure.sh
@@ -175,15 +175,15 @@ function install-node-problem-detector {
      local -r npd_version="${DEFAULT_NPD_VERSION}"
      local -r npd_sha1="${DEFAULT_NPD_SHA1}"
  fi
+  local -r npd_tar="node-problem-detector-${npd_version}.tar.gz"
-  if is-preloaded "node-problem-detector" "${npd_sha1}"; then
+  if is-preloaded "${npd_tar}" "${npd_sha1}"; 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}"