Merge pull request #55682 from porridge/unset-array

Automatic merge from submit-queue (batch tested with PRs 55682, 55444, 55456, 55717, 55131). 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>. Do not crash on empty NODE_NAMES array. **Which issue(s) this PR fixes**: Fixes #55675 **Release note**: ```release-note NONE ```

Merge pull request #55682 from porridge/unset-array
c5234594 · Kubernetes Submit Queue · GitHub · d6325933 · 310ab8c3 · c5234594
Unverified Commit c5234594 authored Nov 15, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

log-dump.sh cluster/log-dump/log-dump.sh +5 -3

No files found.
--- a/cluster/log-dump/log-dump.sh
+++ b/cluster/log-dump/log-dump.sh
@@ -219,7 +219,7 @@ function dump_masters() {
 }
 function dump_nodes() {
-  local node_names
+  local node_names=()
  if [[ -n "${1:-}" ]]; then
    echo "Dumping logs for nodes provided as args to dump_nodes() function"
    node_names=( "$@" )
@@ -232,7 +232,9 @@ function dump_nodes() {
  else
    echo "Detecting nodes in the cluster"
    detect-node-names &> /dev/null
-    node_names=( "${NODE_NAMES[@]}" )
+    if [[ -n "${NODE_NAMES:-}" ]]; then
+      node_names=( "${NODE_NAMES[@]}" )
+    fi
  fi
  if [[ "${#node_names[@]}" == 0 ]]; then
@@ -283,7 +285,7 @@ function dump_nodes_with_logexporter() {
  echo "Detecting nodes in the cluster"
  detect-node-names &> /dev/null
-  if [[ "${#NODE_NAMES[@]}" == 0 ]]; then
+  if [[ -z "${NODE_NAMES:-}" ]]; then
    echo "No nodes found!"
    return
  fi