diff --git a/cluster/common.sh b/cluster/common.sh index 57fd9b8251..590a369432 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -619,6 +619,8 @@ ENABLE_L7_LOADBALANCING: $(yaml-quote ${ENABLE_L7_LOADBALANCING:-none}) ENABLE_CLUSTER_LOGGING: $(yaml-quote ${ENABLE_CLUSTER_LOGGING:-false}) ENABLE_CLUSTER_UI: $(yaml-quote ${ENABLE_CLUSTER_UI:-false}) ENABLE_NODE_PROBLEM_DETECTOR: $(yaml-quote ${ENABLE_NODE_PROBLEM_DETECTOR:-none}) +NODE_PROBLEM_DETECTOR_VERSION: $(yaml-quote ${NODE_PROBLEM_DETECTOR_VERSION:-}) +NODE_PROBLEM_DETECTOR_TAR_HASH: $(yaml-quote ${NODE_PROBLEM_DETECTOR_TAR_HASH:-}) ENABLE_NODE_LOGGING: $(yaml-quote ${ENABLE_NODE_LOGGING:-false}) ENABLE_RESCHEDULER: $(yaml-quote ${ENABLE_RESCHEDULER:-false}) LOGGING_DESTINATION: $(yaml-quote ${LOGGING_DESTINATION:-}) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index f5470c647f..8220e04a48 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -182,6 +182,8 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "gci" ]]; then else ENABLE_NODE_PROBLEM_DETECTOR="${KUBE_ENABLE_NODE_PROBLEM_DETECTOR:-daemonset}" fi +NODE_PROBLEM_DETECTOR_VERSION="${NODE_PROBLEM_DETECTOR_VERSION:-}" +NODE_PROBLEM_DETECTOR_TAR_HASH="${NODE_PROBLEM_DETECTOR_TAR_HASH:-}" # Optional: Create autoscaler for cluster's nodes. ENABLE_CLUSTER_AUTOSCALER="${KUBE_ENABLE_CLUSTER_AUTOSCALER:-false}" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 5eb9a68af3..c408487cfd 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -213,6 +213,8 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "gci" ]]; then else ENABLE_NODE_PROBLEM_DETECTOR="${KUBE_ENABLE_NODE_PROBLEM_DETECTOR:-daemonset}" fi +NODE_PROBLEM_DETECTOR_VERSION="${NODE_PROBLEM_DETECTOR_VERSION:-}" +NODE_PROBLEM_DETECTOR_TAR_HASH="${NODE_PROBLEM_DETECTOR_TAR_HASH:-}" # Optional: Create autoscaler for cluster's nodes. ENABLE_CLUSTER_AUTOSCALER="${KUBE_ENABLE_CLUSTER_AUTOSCALER:-false}" diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index d1377d0f9e..df1fac98b4 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -131,8 +131,13 @@ function install-gci-mounter-tools { # Install node problem detector binary. function install-node-problem-detector { - local -r npd_version="v0.3.0" - local -r npd_sha1="2e6423c5798e14464271d9c944e56a637ee5a4bc" + if [[ -n "${NODE_PROBLEM_DETECTOR_VERSION:-}" ]]; then + local -r npd_version="${NODE_PROBLEM_DETECTOR_VERSION}" + local -r npd_sha1="${NODE_PROBLEM_DETECTOR_TAR_HASH}" + else + local -r npd_version="v0.3.0" + local -r npd_sha1="2e6423c5798e14464271d9c944e56a637ee5a4bc" + fi 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}"