Skip to content

Commit

Permalink
Merge pull request #66090 from Random-Liu/automated-cherry-pick-of-#6…
Browse files Browse the repository at this point in the history
…2743-upstream-release-1.9

Automatic merge from submit-queue.

Automated cherry pick of #62743: Fix NPD preload.

Cherry pick of #62743 on release-1.9.

#62743: Fix NPD preload.

We need to cherry-pick this because node startup time on GCE slows down for 10 seconds without this. /cc @mbohlool 

@yujuhong @mwielgus
  • Loading branch information
Kubernetes Submit Queue committed Jul 19, 2018
2 parents dae182a + a062620 commit 6436fb0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cluster/gce/gci/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,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}"
Expand Down

0 comments on commit 6436fb0

Please sign in to comment.