Merge pull request #38111 from henrynash/pipe141error

Automatic merge from submit-queue (batch tested with PRs 38111, 38121) Prevent SIGPIPE errors causing the version check line to fail The way we use pipe in hack/lib/etcd.sh when processing the version command can lead to 141 failues on some systems. Using a prefix of tail can prevent this. Fixes #38109

Merge pull request #38111 from henrynash/pipe141error
5e923ddc · Kubernetes Submit Queue · GitHub · 55f13b57 · ec331646 · 5e923ddc
Commit 5e923ddc authored Dec 05, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

etcd.sh hack/lib/etcd.sh +1 -1

No files found.
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -32,7 +32,7 @@ kube::etcd::start() {
    exit 1
  fi
-  version=$(etcd --version | head -n 1 | cut -d " " -f 3)
+  version=$(etcd --version | tail -n +1 | head -n 1 | cut -d " " -f 3)
  if [[ "${version}" < "${ETCD_VERSION}" ]]; then
   kube::log::usage "etcd version ${ETCD_VERSION} or greater required."
   kube::log::info "You can use 'hack/install-etcd.sh' to install a copy in third_party/."