github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #76922 from xichengliudui/small-bug 

Fix two minor bugs in kubeadm
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-23 07:53:35 -07:00 committed by GitHub
parent 137aa9f1b2 a5b88f69e9
commit 44f254d55e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/util/apiclient/wait.go
View File

@ -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)

2
cmd/kubeadm/app/util/config/cluster.go
View File

@ -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) {