github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #84294 from denkensk/remove-predicate-nodeinfo-kubelet

Browse Source 
Remove predicates.NodeInfo dependency from kubelet
This commit is contained in:
Kubernetes Prow Robot
2019-10-28 17:48:56 -07:00
committed by GitHub
parent 0c88c4893f b1a3fb4988
commit b8f03a12dd
6 changed files with 31 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kubelet_getters.go
View File

@@ -228,7 +228,7 @@ func (kl *Kubelet) GetNode() (*v1.Node, error) {
if kl.kubeClient == nil {
return kl.initialNode(context.TODO())
}
return kl.nodeInfo.GetNodeInfo(string(kl.nodeName))
return kl.nodeLister.Get(string(kl.nodeName))
}
// getNodeAnyWay() must return a *v1.Node which is required by RunGeneralPredicates().
@@ -238,7 +238,7 @@ func (kl *Kubelet) GetNode() (*v1.Node, error) {
// zero capacity, and the default labels.
func (kl *Kubelet) getNodeAnyWay() (*v1.Node, error) {
if kl.kubeClient != nil {
if n, err := kl.nodeInfo.GetNodeInfo(string(kl.nodeName)); err == nil {
if n, err := kl.nodeLister.Get(string(kl.nodeName)); err == nil {
return n, nil
}
}