Merge pull request #106872 from calvin0327/fix-kubeadm-kubelet-constant

kubeadm: amend constant to kubelet.
kubernetes · Dec 10, 2021 · 481459d · 481459d
2 parents 461dc9e + fdf33a2
commit 481459d
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/cmd/kubeadm/app/phases/kubelet/kubelet.go b/cmd/kubeadm/app/phases/kubelet/kubelet.go
@@ -19,6 +19,7 @@ package kubelet
 import (
 	"fmt"
 
+	kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/kubernetes/cmd/kubeadm/app/util/initsystem"
 )
 
@@ -31,12 +32,12 @@ func TryStartKubelet() {
 		return
 	}
 
-	if !initSystem.ServiceExists("kubelet") {
+	if !initSystem.ServiceExists(kubeadmconstants.Kubelet) {
 		fmt.Println("[kubelet-start] couldn't detect a kubelet service, can't make sure the kubelet is running properly.")
 	}
 
 	// This runs "systemctl daemon-reload && systemctl restart kubelet"
-	if err := initSystem.ServiceRestart("kubelet"); err != nil {
+	if err := initSystem.ServiceRestart(kubeadmconstants.Kubelet); err != nil {
 		fmt.Printf("[kubelet-start] WARNING: unable to start the kubelet service: [%v]\n", err)
 		fmt.Printf("[kubelet-start] Please ensure kubelet is reloaded and running manually.\n")
 	}
@@ -51,12 +52,12 @@ func TryStopKubelet() {
 		return
 	}
 
-	if !initSystem.ServiceExists("kubelet") {
+	if !initSystem.ServiceExists(kubeadmconstants.Kubelet) {
 		fmt.Println("[kubelet-start] couldn't detect a kubelet service, can't make sure the kubelet not running for a short period of time while setting up configuration for it.")
 	}
 
 	// This runs "systemctl daemon-reload && systemctl stop kubelet"
-	if err := initSystem.ServiceStop("kubelet"); err != nil {
+	if err := initSystem.ServiceStop(kubeadmconstants.Kubelet); err != nil {
 		fmt.Printf("[kubelet-start] WARNING: unable to stop the kubelet service momentarily: [%v]\n", err)
 	}
 }
@@ -70,12 +71,12 @@ func TryRestartKubelet() {
 		return
 	}
 
-	if !initSystem.ServiceExists("kubelet") {
+	if !initSystem.ServiceExists(kubeadmconstants.Kubelet) {
 		fmt.Println("[kubelet-start] couldn't detect a kubelet service, can't make sure the kubelet not running for a short period of time while setting up configuration for it.")
 	}
 
 	// This runs "systemctl daemon-reload && systemctl stop kubelet"
-	if err := initSystem.ServiceRestart("kubelet"); err != nil {
+	if err := initSystem.ServiceRestart(kubeadmconstants.Kubelet); err != nil {
 		fmt.Printf("[kubelet-start] WARNING: unable to restart the kubelet service momentarily: [%v]\n", err)
 	}
 }