Merge pull request kubernetes#95943 from aojea/upgradejob

k8s-ci-robot · web-flow · commit 53d63fb74816 · 2020-10-28T06:39:56.000-07:00
fix unbound variable on upgrade
diff --git a/cluster/gce/upgrade.sh b/cluster/gce/upgrade.sh
@@ -462,7 +462,9 @@ function update-coredns-config() {
 
   # clean up
   cleanup() {
-    rm -rf "${download_dir}"
+    if [ -n "${download_dir:-}" ]; then
+      rm -rf "${download_dir}"
+    fi
   }
   trap cleanup RETURN
 

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,9 @@ function update-coredns-config() {`
`462`	`462`
`463`	`463`	`# clean up`
`464`	`464`	`cleanup() {`
`465`		`- rm -rf "${download_dir}"`
	`465`	`+ if [ -n "${download_dir:-}" ]; then`
	`466`	`+ rm -rf "${download_dir}"`
	`467`	`+ fi`
`466`	`468`	`}`
`467`	`469`	`trap cleanup RETURN`
`468`	`470`