Merge pull request kubernetes#95525 from tosi3k/master-log-dump-gke

k8s-ci-robot · web-flow · commit 6c40e16cd817 · 2020-10-13T16:26:08.000-07:00
Fix log dumping for GKE
diff --git a/cluster/log-dump/log-dump.sh b/cluster/log-dump/log-dump.sh
@@ -344,7 +344,7 @@ function run-in-docker-container() {
 }
 
 function dump_masters() {
-  local master_names
+  local master_names=()
   if [[ -n "${use_custom_instance_list}" ]]; then
     while IFS='' read -r line; do master_names+=("$line"); done < <(log_dump_custom_get_instances master)
   elif [[ ! "${master_ssh_supported_providers}" =~ ${KUBERNETES_PROVIDER} ]]; then

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ function run-in-docker-container() {`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`function dump_masters() {`
`347`		`- local master_names`
	`347`	`+ local master_names=()`
`348`	`348`	`if [[ -n "${use_custom_instance_list}" ]]; then`
`349`	`349`	`while IFS='' read -r line; do master_names+=("$line"); done < <(log_dump_custom_get_instances master)`
`350`	`350`	`elif [[ ! "${master_ssh_supported_providers}" =~ ${KUBERNETES_PROVIDER} ]]; then`