Use /bin/bash in kubelet manifest ExecStartPre

coreypobrien · coreypobrien · commit af5f877a38d4 · 2018-07-11T00:04:13.000-04:00
diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go
@@ -244,7 +244,7 @@ func (b *KubeletBuilder) buildSystemdService() *nodetasks.Service {
 	// @check if we are using bootstrap tokens and file checker
 	if !b.IsMaster && b.UseBootstrapTokens() {
 		manifest.Set("Service", "ExecStartPre",
-			fmt.Sprintf("/usr/bin/bash -c 'while [ ! -f %s ]; do sleep 5; done;'", b.KubeletBootstrapKubeconfig()))
+			fmt.Sprintf("/bin/bash -c 'while [ ! -f %s ]; do sleep 5; done;'", b.KubeletBootstrapKubeconfig()))
 	}
 
 	manifest.Set("Service", "ExecStart", kubeletCommand+" \"$DAEMON_ARGS\"")

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ func (b KubeletBuilder) buildSystemdService() nodetasks.Service {`
`244`	`244`	`// @check if we are using bootstrap tokens and file checker`
`245`	`245`	`if !b.IsMaster && b.UseBootstrapTokens() {`
`246`	`246`	`manifest.Set("Service", "ExecStartPre",`
`247`		`- fmt.Sprintf("/usr/bin/bash -c 'while [ ! -f %s ]; do sleep 5; done;'", b.KubeletBootstrapKubeconfig()))`
	`247`	`+ fmt.Sprintf("/bin/bash -c 'while [ ! -f %s ]; do sleep 5; done;'", b.KubeletBootstrapKubeconfig()))`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`manifest.Set("Service", "ExecStart", kubeletCommand+" \"$DAEMON_ARGS\"")`