diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 41facb38976..9e35531add3 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -2174,19 +2174,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 87c2cf74d40..900d6b0c645 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" @@ -99,16 +98,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/pkg/kubelet/pod/pod_manager.go b/pkg/kubelet/pod/pod_manager.go index 8c7851f6207..5fc0603408d 100644 --- a/pkg/kubelet/pod/pod_manager.go +++ b/pkg/kubelet/pod/pod_manager.go @@ -199,11 +199,6 @@ func (pm *basicManager) GetPodsAndMirrorPods() ([]*api.Pod, []*api.Pod) { return pods, mirrorPods } -// Returns all pods (including mirror pods). -func (pm *basicManager) getAllPods() []*api.Pod { - return append(podsMapToPods(pm.podByUID), podsMapToPods(pm.mirrorPodByUID)...) -} - func (pm *basicManager) GetPodByUID(uid types.UID) (*api.Pod, bool) { pm.lock.RLock() defer pm.lock.RUnlock() diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/plugin/pkg/scheduler/algorithm/predicates/predicates.go index d46fbcc7284..06f5605f505 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go @@ -533,7 +533,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) @@ -590,7 +590,7 @@ func PodSelectorMatches(pod *api.Pod, meta interface{}, nodeInfo *schedulercache if node == nil { return false, fmt.Errorf("node not found") } - if PodMatchesNodeLabels(pod, node) { + if podMatchesNodeLabels(pod, node) { return true, nil } return false, ErrNodeSelectorNotMatch