github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
```
pull/6/head
Kubernetes Submit Queue 2017-11-15 23:06:05 -08:00 committed by GitHub
parent d6325933e1 310ab8c3c4
commit c523459467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/log-dump/log-dump.sh
View File

@ -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