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

k8s-ci-robot · web-flow · commit 057fdffa6e23 · 2024-08-23T06:51:51.000+01:00
🐛 always declare try-or-die-command function in kubeadm-bootstrap-script.sh
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 }}

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,6 @@ function retry-command() {`
`106`	`106`	`fi`
`107`	`107`	`}`
`108`	`108`
`109`		`-# {{ if .ControlPlane }}`
`110`	`109`	`function try-or-die-command() {`
`111`	`110`	`local kubeadm_return`
`112`	`111`	`log::info "running '$*'"`
`@@ -118,7 +117,6 @@ function try-or-die-command() {`
`118`	`117`	`log::error_exit "fatal error, exiting" "${kubeadm_return}"`
`119`	`118`	`fi`
`120`	`119`	`}`
`121`		`-# {{ end }}`
`122`	`120`
`123`	`121`	`retry-command kubeadm join phase preflight --ignore-preflight-errors=DirAvailable--etc-kubernetes-manifests`
`124`	`122`	`# {{ if .ControlPlane }}`