Merge pull request #86877 from ahg-g/ahg1-cleanup2

Remove unused scheduler types

pkg/scheduler/algorithm/BUILD

@@ -1,5 +1,3 @@
-package(default_visibility = ["//visibility:public"])
-
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
@@ -7,18 +5,13 @@ go_library(
     srcs = [
         "doc.go",
         "scheduler_interface.go",
-        "types.go",
     ],
     importpath = "k8s.io/kubernetes/pkg/scheduler/algorithm",
+    visibility = ["//visibility:public"],
     deps = [
-        "//pkg/apis/apps:go_default_library",
         "//pkg/scheduler/apis/extender/v1:go_default_library",
         "//pkg/scheduler/nodeinfo:go_default_library",
-        "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
-        "//staging/src/k8s.io/client-go/listers/apps/v1:go_default_library",
-        "//staging/src/k8s.io/client-go/listers/core/v1:go_default_library",
     ],
 )
 
@@ -37,4 +30,5 @@ filegroup(
         "//pkg/scheduler/algorithm/priorities:all-srcs",
     ],
     tags = ["automanaged"],
+    visibility = ["//visibility:public"],
 )

pkg/scheduler/algorithm/predicates/BUILD

@@ -1,10 +1,4 @@
-package(default_visibility = ["//visibility:public"])
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
 
 go_library(
     name = "go_default_library",
@@ -15,6 +9,7 @@ go_library(
         "utils.go",
     ],
     importpath = "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates",
+    visibility = ["//visibility:public"],
     deps = [
         "//pkg/apis/core/v1/helper:go_default_library",
         "//pkg/features:go_default_library",
@@ -62,4 +57,5 @@ filegroup(
     name = "all-srcs",
     srcs = [":package-srcs"],
     tags = ["automanaged"],
+    visibility = ["//visibility:public"],
 )

pkg/scheduler/algorithm/priorities/BUILD

@@ -37,11 +37,9 @@ go_test(
         "metadata_test.go",
         "selector_spreading_test.go",
         "spreading_perf_test.go",
-        "types_test.go",
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/scheduler/algorithm:go_default_library",
         "//pkg/scheduler/algorithm/priorities/util:go_default_library",
         "//pkg/scheduler/framework/v1alpha1:go_default_library",
         "//pkg/scheduler/listers/fake:go_default_library",

pkg/scheduler/algorithm/priorities/types_test.go

@@ -1,65 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package priorities
-
-import (
-	"testing"
-
-	"k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/kubernetes/pkg/scheduler/algorithm"
-	nodeinfosnapshot "k8s.io/kubernetes/pkg/scheduler/nodeinfo/snapshot"
-	st "k8s.io/kubernetes/pkg/scheduler/testing"
-)
-
-// EmptyMetadataProducer should return a no-op MetadataProducer type.
-func TestEmptyPriorityMetadataProducer(t *testing.T) {
-	fakePod := st.MakePod().Name("p1").Node("node2").Obj()
-	fakeLabelSelector := labels.SelectorFromSet(labels.Set{"foo": "bar"})
-	fakeNodes := []*v1.Node{st.MakeNode().Name("node1").Obj(), st.MakeNode().Name("node-a").Obj()}
-
-	snapshot := nodeinfosnapshot.NewSnapshot(nodeinfosnapshot.CreateNodeInfoMap([]*v1.Pod{fakePod}, fakeNodes))
-	// Test EmptyMetadataProducer
-	metadata := EmptyMetadataProducer(fakePod, fakeNodes, snapshot)
-	if metadata != nil {
-		t.Errorf("failed to produce empty metadata: got %v, expected nil", metadata)
-	}
-	// Test EmptyControllerLister should return nill
-	controllerLister := algorithm.EmptyControllerLister{}
-	nilController, nilError := controllerLister.List(fakeLabelSelector)
-	if nilController != nil || nilError != nil {
-		t.Errorf("failed to produce empty controller lister: got %v, expected nil", nilController)
-	}
-	// Test GetPodControllers on empty controller lister should return nill
-	nilController, nilError = controllerLister.GetPodControllers(fakePod)
-	if nilController != nil || nilError != nil {
-		t.Errorf("failed to produce empty controller lister: got %v, expected nil", nilController)
-	}
-	// Test GetPodReplicaSets on empty replica sets should return nill
-	replicaSetLister := algorithm.EmptyReplicaSetLister{}
-	nilRss, nilErrRss := replicaSetLister.GetPodReplicaSets(fakePod)
-	if nilRss != nil || nilErrRss != nil {
-		t.Errorf("failed to produce empty replicaSetLister: got %v, expected nil", nilRss)
-	}
-
-	// Test GetPodStatefulSets on empty replica sets should return nill
-	statefulSetLister := algorithm.EmptyStatefulSetLister{}
-	nilSSL, nilErrSSL := statefulSetLister.GetPodStatefulSets(fakePod)
-	if nilSSL != nil || nilErrSSL != nil {
-		t.Errorf("failed to produce empty statefulSetLister: got %v, expected nil", nilSSL)
-	}
-}

pkg/scheduler/algorithm/types.go

@@ -1,92 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package algorithm
-
-import (
-	appsv1 "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/labels"
-	appslisters "k8s.io/client-go/listers/apps/v1"
-	corelisters "k8s.io/client-go/listers/core/v1"
-	"k8s.io/kubernetes/pkg/apis/apps"
-)
-
-var _ corelisters.ReplicationControllerLister = &EmptyControllerLister{}
-
-// EmptyControllerLister implements ControllerLister on []v1.ReplicationController returning empty data
-type EmptyControllerLister struct{}
-
-// List returns nil
-func (f EmptyControllerLister) List(labels.Selector) ([]*v1.ReplicationController, error) {
-	return nil, nil
-}
-
-// GetPodControllers returns nil
-func (f EmptyControllerLister) GetPodControllers(pod *v1.Pod) (controllers []*v1.ReplicationController, err error) {
-	return nil, nil
-}
-
-// ReplicationControllers returns nil
-func (f EmptyControllerLister) ReplicationControllers(namespace string) corelisters.ReplicationControllerNamespaceLister {
-	return nil
-}
-
-var _ appslisters.ReplicaSetLister = &EmptyReplicaSetLister{}
-
-// EmptyReplicaSetLister implements ReplicaSetLister on []extensions.ReplicaSet returning empty data
-type EmptyReplicaSetLister struct{}
-
-// List returns nil
-func (f EmptyReplicaSetLister) List(labels.Selector) ([]*appsv1.ReplicaSet, error) {
-	return nil, nil
-}
-
-// GetPodReplicaSets returns nil
-func (f EmptyReplicaSetLister) GetPodReplicaSets(pod *v1.Pod) (rss []*appsv1.ReplicaSet, err error) {
-	return nil, nil
-}
-
-// ReplicaSets returns nil
-func (f EmptyReplicaSetLister) ReplicaSets(namespace string) appslisters.ReplicaSetNamespaceLister {
-	return nil
-}
-
-// StatefulSetLister interface represents anything that can produce a list of StatefulSet; the list is consumed by a scheduler.
-type StatefulSetLister interface {
-	// Gets the StatefulSet for the given pod.
-	GetPodStatefulSets(*v1.Pod) ([]*apps.StatefulSet, error)
-}
-
-var _ appslisters.StatefulSetLister = &EmptyStatefulSetLister{}
-
-// EmptyStatefulSetLister implements StatefulSetLister on []apps.StatefulSet returning empty data.
-type EmptyStatefulSetLister struct{}
-
-// List returns nil
-func (f EmptyStatefulSetLister) List(labels.Selector) ([]*appsv1.StatefulSet, error) {
-	return nil, nil
-}
-
-// GetPodStatefulSets of EmptyStatefulSetLister returns nil.
-func (f EmptyStatefulSetLister) GetPodStatefulSets(pod *v1.Pod) (sss []*appsv1.StatefulSet, err error) {
-	return nil, nil
-}
-
-// StatefulSets returns nil
-func (f EmptyStatefulSetLister) StatefulSets(namespace string) appslisters.StatefulSetNamespaceLister {
-	return nil
-}

pkg/scheduler/framework/plugins/helper/BUILD

@@ -9,7 +9,6 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/apis/core:go_default_library",
         "//pkg/apis/core/v1/helper:go_default_library",
         "//pkg/scheduler/framework/v1alpha1:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",

pkg/scheduler/framework/plugins/helper/node_affinity.go

@@ -20,7 +20,6 @@ import (
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
-	api "k8s.io/kubernetes/pkg/apis/core"
 	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
 )
 
@@ -73,7 +72,7 @@ func PodMatchesNodeSelectorAndAffinityTerms(pod *v1.Pod, node *v1.Node) bool {
 // nodeMatchesNodeSelectorTerms checks if a node's labels satisfy a list of node selector terms,
 // terms are ORed, and an empty list of terms will match nothing.
 func nodeMatchesNodeSelectorTerms(node *v1.Node, nodeSelectorTerms []v1.NodeSelectorTerm) bool {
-	return v1helper.MatchNodeSelectorTerms(nodeSelectorTerms, labels.Set(node.Labels), fields.Set{
+	return v1helper.MatchNodeSelectorTerms(nodeSelectorTerms, node.Labels, fields.Set{
-		api.ObjectNameField: node.Name,
+		"metadata.name": node.Name,
 	})
 }