Merge pull request #4106 from CecileRobertMichon/backport-script-exit…

…code 🐛 Set error_exit code arg in kubeadm bootstrap script
kubernetes-sigs · Jan 22, 2021 · fccc84c · fccc84c
2 parents 96a3152 + c9b65cf
commit fccc84c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/bootstrap/kubeadm/internal/cloudinit/kubeadm-bootstrap-script.sh b/bootstrap/kubeadm/internal/cloudinit/kubeadm-bootstrap-script.sh
@@ -74,7 +74,7 @@ check_kubeadm_command() {
     log::error "kubeadm reported preflight check error during ${command}"
     ;;
   "3")
-    log::error_exit "kubeadm reported validation error for ${command}"
+    log::error_exit "kubeadm reported validation error for ${command}" "${code}"
     ;;
   *)
     log::error "kubeadm reported unknown error ${code} for ${command}"
@@ -102,7 +102,7 @@ function retry-command() {
     sleep 15
   done
   if [ ${kubeadm_return} -ne 0 ]; then
-    log::error_exit "too many errors, exiting"
+    log::error_exit "too many errors, exiting" "${kubeadm_return}"
   fi
 }
 
@@ -115,7 +115,7 @@ function try-or-die-command() {
   kubeadm_return=$?
   check_kubeadm_command "'$*'" "${kubeadm_return}"
   if [ ${kubeadm_return} -ne 0 ]; then
-    log::error_exit "fatal error, exiting"
+    log::error_exit "fatal error, exiting" "${kubeadm_return}"
   fi
 }
 # {{ end }}

diff --git a/bootstrap/kubeadm/internal/cloudinit/zz_generated.bindata.go b/bootstrap/kubeadm/internal/cloudinit/zz_generated.bindata.go