Merge pull request kubernetes#76922 from xichengliudui/small-bug

k8s-ci-robot · web-flow · commit 44f254d55e4a · 2019-04-23T07:53:35.000-07:00
Fix two minor bugs in kubeadm
diff --git a/cmd/kubeadm/app/util/apiclient/wait.go b/cmd/kubeadm/app/util/apiclient/wait.go
@@ -238,7 +238,7 @@ func (w *KubeWaiter) WaitForStaticPodHashChange(nodeName, component, previousHas
 	})
 }
 
-// getStaticSinglePodHash computes hashes for a single Static Pod resource
+// getStaticPodSingleHash computes hashes for a single Static Pod resource
 func getStaticPodSingleHash(client clientset.Interface, nodeName string, component string) (string, error) {
 
 	staticPodName := fmt.Sprintf("%s-%s", component, nodeName)
diff --git a/cmd/kubeadm/app/util/config/cluster.go b/cmd/kubeadm/app/util/config/cluster.go
@@ -135,7 +135,7 @@ func getNodeRegistration(kubeconfigDir string, client clientset.Interface, nodeR
 	return nil
 }
 
-// getNodeNameFromConfig gets the node name from a kubelet config file
+// getNodeNameFromKubeletConfig gets the node name from a kubelet config file
 // TODO: in future we want to switch to a more canonical way for doing this e.g. by having this
 //       information in the local kubelet config.yaml
 func getNodeNameFromKubeletConfig(kubeconfigDir string) (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ func (w *KubeWaiter) WaitForStaticPodHashChange(nodeName, component, previousHas`
`238`	`238`	`})`
`239`	`239`	`}`
`240`	`240`
`241`		`-// getStaticSinglePodHash computes hashes for a single Static Pod resource`
	`241`	`+// getStaticPodSingleHash computes hashes for a single Static Pod resource`
`242`	`242`	`func getStaticPodSingleHash(client clientset.Interface, nodeName string, component string) (string, error) {`
`243`	`243`
`244`	`244`	`staticPodName := fmt.Sprintf("%s-%s", component, nodeName)`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ func getNodeRegistration(kubeconfigDir string, client clientset.Interface, nodeR`
`135`	`135`	`return nil`
`136`	`136`	`}`
`137`	`137`
`138`		`-// getNodeNameFromConfig gets the node name from a kubelet config file`
	`138`	`+// getNodeNameFromKubeletConfig gets the node name from a kubelet config file`
`139`	`139`	`// TODO: in future we want to switch to a more canonical way for doing this e.g. by having this`
`140`	`140`	`// information in the local kubelet config.yaml`
`141`	`141`	`func getNodeNameFromKubeletConfig(kubeconfigDir string) (string, error) {`