Merge pull request #59852 from cblecker/etcd-fix

Automatic merge from submit-queue (batch tested with PRs 59878, 59852). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Check if netstat or iproute2 is available **What this PR does / why we need it**: In https://github.com/kubernetes/kubernetes/pull/59655, I incorrectly assumed that the kubetest image would have net-tools. It doesn't. This checks and uses `ss` from iproute2, *or* `netstat` from net-tools. The kubetest image does appear to have iproute2. **Release note**: ```release-note NONE ```

Merge pull request #59852 from cblecker/etcd-fix
571158e8 · Kubernetes Submit Queue · GitHub · d38e2234 · ceacae42 · 571158e8
Unverified Commit 571158e8 authored Feb 14, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

etcd.sh hack/lib/etcd.sh +11 -2

No files found.
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -22,13 +22,22 @@ ETCD_PORT=${ETCD_PORT:-2379}

 kube::etcd::validate() {
  # validate if in path
-  which etcd >/dev/null || {
+  command -v etcd >/dev/null || {
    kube::log::usage "etcd must be in your PATH"
    exit 1
  }

  # validate etcd port is free
-  if netstat -nat | grep "[\.:]${ETCD_PORT:?} .*LISTEN" >/dev/null 2>&1; then
+  local port_check_command
+  if command -v ss &> /dev/null && ss -Version | grep 'iproute2' &> /dev/null; then
+    port_check_command="ss"
+  elif command -v netstat &>/dev/null; then
+    port_check_command="netstat"
+  else
+    kube::log::usage "unable to identify if etcd is bound to port ${ETCD_PORT}. unable to find ss or netstat utilities."
+    exit 1
+  fi
+  if ${port_check_command} -nat | grep "LISTEN" | grep "[\.:]${ETCD_PORT:?}" >/dev/null 2>&1; then
    kube::log::usage "unable to start etcd as port ${ETCD_PORT} is in use. please stop the process listening on this port and retry."
    kube::log::usage "`netstat -nat | grep "[\.:]${ETCD_PORT:?} .*LISTEN"`"
    exit 1