Merge pull request #11089 from chewong/try-or-die-command-1.31

🐛 always declare try-or-die-command function in kubeadm-bootstrap-script.sh
kubernetes-sigs · Aug 23, 2024 · 057fdff · 057fdff
2 parents 1b3e4a7 + 0bd49f5
commit 057fdff
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/bootstrap/kubeadm/internal/cloudinit/kubeadm-bootstrap-script.sh b/bootstrap/kubeadm/internal/cloudinit/kubeadm-bootstrap-script.sh
@@ -106,7 +106,6 @@ function retry-command() {
   fi
 }
 
-# {{ if .ControlPlane }}
 function try-or-die-command() {
   local kubeadm_return
   log::info "running '$*'"
@@ -118,7 +117,6 @@ function try-or-die-command() {
     log::error_exit "fatal error, exiting" "${kubeadm_return}"
   fi
 }
-# {{ end }}
 
 retry-command kubeadm join phase preflight --ignore-preflight-errors=DirAvailable--etc-kubernetes-manifests
 # {{ if .ControlPlane }}