diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index bb5b2f87a25..deaf75c2a96 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -2357,19 +2357,6 @@ func (kl *Kubelet) isOutOfDisk() bool { return false } -// matchesNodeSelector returns true if pod matches node's labels. -func (kl *Kubelet) matchesNodeSelector(pod *api.Pod) bool { - if kl.standaloneMode { - return true - } - node, err := kl.GetNode() - if err != nil { - glog.Errorf("error getting node: %v", err) - return false - } - return predicates.PodMatchesNodeLabels(pod, node) -} - // rejectPod records an event about the pod with the given reason and message, // and updates the pod to the failed phase in the status manage. func (kl *Kubelet) rejectPod(pod *api.Pod, reason, message string) { diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index e9d6ec049e0..9f91a78bd90 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -22,7 +22,6 @@ import ( "io" "io/ioutil" "net" - "net/http" "os" "reflect" goruntime "runtime" @@ -100,16 +99,6 @@ const ( maxImgSize int64 = 1000 * 1024 * 1024 ) -type fakeHTTP struct { - url string - err error -} - -func (f *fakeHTTP) Get(url string) (*http.Response, error) { - f.url = url - return nil, f.err -} - type TestKubelet struct { kubelet *Kubelet fakeRuntime *containertest.FakeRuntime diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/plugin/pkg/scheduler/algorithm/predicates/predicates.go index 8eb607845a8..f0f27f33073 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go @@ -492,7 +492,7 @@ func nodeMatchesNodeSelectorTerms(node *api.Node, nodeSelectorTerms []api.NodeSe } // The pod can only schedule onto nodes that satisfy requirements in both NodeAffinity and nodeSelector. -func PodMatchesNodeLabels(pod *api.Pod, node *api.Node) bool { +func podMatchesNodeLabels(pod *api.Pod, node *api.Node) bool { // Check if node.Labels match pod.Spec.NodeSelector. if len(pod.Spec.NodeSelector) > 0 { selector := labels.SelectorFromSet(pod.Spec.NodeSelector) @@ -549,7 +549,7 @@ func PodSelectorMatches(pod *api.Pod, nodeInfo *schedulercache.NodeInfo) (bool, if node == nil { return false, fmt.Errorf("node not found") } - if PodMatchesNodeLabels(pod, node) { + if podMatchesNodeLabels(pod, node) { return true, nil } return false, ErrNodeSelectorNotMatch