Merge pull request kubernetes#120514 from fengxsong/patch-1

k8s-ci-robot · web-flow · commit 0241da314e0e · 2023-09-15T14:08:23.000-07:00
fix: check if initsystem service exists
diff --git a/cmd/kubeadm/app/util/initsystem/initsystem_unix.go b/cmd/kubeadm/app/util/initsystem/initsystem_unix.go
@@ -125,7 +125,7 @@ func (sysd SystemdInitSystem) ServiceExists(service string) bool {
 	args := []string{"status", service}
 	outBytes, _ := exec.Command("systemctl", args...).Output()
 	output := string(outBytes)
-	return !strings.Contains(output, "Loaded: not-found")
+	return !strings.Contains(output, "Loaded: not-found") && !strings.Contains(output, "could not be found")
 }
 
 // ServiceIsEnabled ensures the service is enabled to start on each boot.

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func (sysd SystemdInitSystem) ServiceExists(service string) bool {`
`125`	`125`	`args := []string{"status", service}`
`126`	`126`	`outBytes, _ := exec.Command("systemctl", args...).Output()`
`127`	`127`	`output := string(outBytes)`
`128`		`- return !strings.Contains(output, "Loaded: not-found")`
	`128`	`+ return !strings.Contains(output, "Loaded: not-found") && !strings.Contains(output, "could not be found")`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`// ServiceIsEnabled ensures the service is enabled to start on each boot.`