Merge pull request kubernetes#86585 from SataQiu/scheduler-taint-toleration

"Move Taint and toleration priority to its Score plugin"

Author: k8s-ci-robot

pkg/scheduler/algorithm/priorities/BUILD

@@ -22,7 +22,6 @@ go_library(
         "resource_allocation.go",
         "resource_limits.go",
         "selector_spreading.go",
-        "taint_toleration.go",
         "test_util.go",
         "types.go",
     ],
@@ -62,7 +61,6 @@ go_test(
         "resource_limits_test.go",
         "selector_spreading_test.go",
         "spreading_perf_test.go",
-        "taint_toleration_test.go",
         "types_test.go",
     ],
     embed = [":go_default_library"],

pkg/scheduler/algorithm/priorities/metadata.go

@@ -57,7 +57,6 @@ func NewMetadataFactory(
 // priorityMetadata is a type that is passed as metadata for priority functions
 type priorityMetadata struct {
 	podLimits               *schedulernodeinfo.Resource
-	podTolerations          []v1.Toleration
 	affinity                *v1.Affinity
 	podSelector             labels.Selector
 	controllerRef           *metav1.OwnerReference
@@ -88,7 +87,6 @@ func (pmf *MetadataFactory) PriorityMetadata(
 	}
 	return &priorityMetadata{
 		podLimits:               getResourceLimits(pod),
-		podTolerations:          getAllTolerationPreferNoSchedule(pod.Spec.Tolerations),
 		affinity:                pod.Spec.Affinity,
 		podSelector:             getSelector(pod, pmf.serviceLister, pmf.controllerLister, pmf.replicaSetLister, pmf.statefulSetLister),
 		controllerRef:           metav1.GetControllerOf(pod),

pkg/scheduler/algorithm/priorities/metadata_test.go

@@ -138,30 +138,27 @@ func TestPriorityMetadata(t *testing.T) {
 		{
 			pod: podWithTolerationsAndAffinity,
 			expected: &priorityMetadata{
-				podLimits:      nonPodLimits,
-				podTolerations: tolerations,
-				affinity:       podAffinity,
-				podSelector:    labels.NewSelector(),
+				podLimits:   nonPodLimits,
+				affinity:    podAffinity,
+				podSelector: labels.NewSelector(),
 			},
 			name: "Produce a priorityMetadata with default requests",
 		},
 		{
 			pod: podWithTolerationsAndRequests,
 			expected: &priorityMetadata{
-				podLimits:      nonPodLimits,
-				podTolerations: tolerations,
-				affinity:       nil,
-				podSelector:    labels.NewSelector(),
+				podLimits:   nonPodLimits,
+				affinity:    nil,
+				podSelector: labels.NewSelector(),
 			},
 			name: "Produce a priorityMetadata with tolerations and requests",
 		},
 		{
 			pod: podWithAffinityAndRequests,
 			expected: &priorityMetadata{
-				podLimits:      specifiedPodLimits,
-				podTolerations: nil,
-				affinity:       podAffinity,
-				podSelector:    labels.NewSelector(),
+				podLimits:   specifiedPodLimits,
+				affinity:    podAffinity,
+				podSelector: labels.NewSelector(),
 			},
 			name: "Produce a priorityMetadata with affinity and requests",
 		},