Merge pull request kubernetes#82283 from ahmad-diaa/fix-field-types-in-scheduler-api-types

k8s-ci-robot · web-flow · commit e53a952fa4da · 2019-09-12T15:56:32.000-07:00
Migrate scheduler api types to sized integers
diff --git a/pkg/scheduler/algorithm/priorities/even_pods_spread.go b/pkg/scheduler/algorithm/priorities/even_pods_spread.go
@@ -176,7 +176,7 @@ func CalculateEvenPodsSpreadPriority(pod *v1.Pod, nodeNameToInfo map[string]*sch
 		// debugging purpose: print the value for each node
 		// score must be pointer here, otherwise it's always 0
 		if klog.V(10) {
-			defer func(score *int, nodeName string) {
+			defer func(score *int64, nodeName string) {
 				klog.Infof("%v -> %v: EvenPodsSpreadPriority, Score: (%d)", pod.Name, nodeName, *score)
 			}(&result[i].Score, node.Name)
 		}
@@ -190,7 +190,7 @@ func CalculateEvenPodsSpreadPriority(pod *v1.Pod, nodeNameToInfo map[string]*sch
 			continue
 		}
 		fScore := float64(schedulerapi.MaxPriority) * (float64(total-t.nodeNameToPodCounts[node.Name]) / float64(maxMinDiff))
-		result[i].Score = int(fScore)
+		result[i].Score = int64(fScore)
 	}
 
 	return result, nil
diff --git a/pkg/scheduler/algorithm/priorities/image_locality.go b/pkg/scheduler/algorithm/priorities/image_locality.go
@@ -55,7 +55,7 @@ func ImageLocalityPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *scheduler
 
 	return schedulerapi.HostPriority{
 		Host:  node.Name,
-		Score: score,
+		Score: int64(score),
 	}, nil
 }
 
diff --git a/pkg/scheduler/algorithm/priorities/interpod_affinity.go b/pkg/scheduler/algorithm/priorities/interpod_affinity.go
@@ -236,7 +236,7 @@ func (ipa *InterPodAffinity) CalculateInterPodAffinityPriority(pod *v1.Pod, node
 		if maxMinDiff > 0 && pm.counts[node.Name] != nil {
 			fScore = float64(schedulerapi.MaxPriority) * (float64(*pm.counts[node.Name]-minCount) / float64(maxCount-minCount))
 		}
-		result = append(result, schedulerapi.HostPriority{Host: node.Name, Score: int(fScore)})
+		result = append(result, schedulerapi.HostPriority{Host: node.Name, Score: int64(fScore)})
 		if klog.V(10) {
 			klog.Infof("%v -> %v: InterPodAffinityPriority, Score: (%d)", pod.Name, node.Name, int(fScore))
 		}
diff --git a/pkg/scheduler/algorithm/priorities/node_affinity.go b/pkg/scheduler/algorithm/priorities/node_affinity.go
@@ -69,7 +69,7 @@ func CalculateNodeAffinityPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *s
 
 	return schedulerapi.HostPriority{
 		Host:  node.Name,
-		Score: int(count),
+		Score: int64(count),
 	}, nil
 }
 
diff --git a/pkg/scheduler/algorithm/priorities/node_label.go b/pkg/scheduler/algorithm/priorities/node_label.go
@@ -56,6 +56,6 @@ func (n *NodeLabelPrioritizer) CalculateNodeLabelPriorityMap(pod *v1.Pod, meta i
 	}
 	return schedulerapi.HostPriority{
 		Host:  node.Name,
-		Score: score,
+		Score: int64(score),
 	}, nil
 }
diff --git a/pkg/scheduler/algorithm/priorities/reduce.go b/pkg/scheduler/algorithm/priorities/reduce.go
@@ -25,14 +25,14 @@ import (
 // NormalizeReduce generates a PriorityReduceFunction that can normalize the result
 // scores to [0, maxPriority]. If reverse is set to true, it reverses the scores by
 // subtracting it from maxPriority.
-func NormalizeReduce(maxPriority int, reverse bool) PriorityReduceFunction {
+func NormalizeReduce(maxPriority int64, reverse bool) PriorityReduceFunction {
 	return func(
 		_ *v1.Pod,
 		_ interface{},
 		_ map[string]*schedulernodeinfo.NodeInfo,
 		result schedulerapi.HostPriorityList) error {
 
-		var maxCount int
+		var maxCount int64
 		for i := range result {
 			if result[i].Score > maxCount {
 				maxCount = result[i].Score
diff --git a/pkg/scheduler/algorithm/priorities/resource_allocation.go b/pkg/scheduler/algorithm/priorities/resource_allocation.go
@@ -92,7 +92,7 @@ func (r *ResourceAllocationPriority) PriorityMap(
 
 	return schedulerapi.HostPriority{
 		Host:  node.Name,
-		Score: int(score),
+		Score: score,
 	}, nil
 }
 
diff --git a/pkg/scheduler/algorithm/priorities/resource_limits.go b/pkg/scheduler/algorithm/priorities/resource_limits.go
@@ -54,7 +54,7 @@ func ResourceLimitsPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *schedule
 	cpuScore := computeScore(podLimits.MilliCPU, allocatableResources.MilliCPU)
 	memScore := computeScore(podLimits.Memory, allocatableResources.Memory)
 
-	score := int(0)
+	score := int64(0)
 	if cpuScore == 1 || memScore == 1 {
 		score = 1
 	}
diff --git a/pkg/scheduler/algorithm/priorities/selector_spreading.go b/pkg/scheduler/algorithm/priorities/selector_spreading.go
@@ -80,15 +80,15 @@ func (s *SelectorSpread) CalculateSpreadPriorityMap(pod *v1.Pod, meta interface{
 	if len(selectors) == 0 {
 		return schedulerapi.HostPriority{
 			Host:  node.Name,
-			Score: int(0),
+			Score: 0,
 		}, nil
 	}
 
 	count := countMatchingPods(pod.Namespace, selectors, nodeInfo)
 
 	return schedulerapi.HostPriority{
 		Host:  node.Name,
-		Score: count,
+		Score: int64(count),
 	}, nil
 }
 
@@ -97,9 +97,9 @@ func (s *SelectorSpread) CalculateSpreadPriorityMap(pod *v1.Pod, meta interface{
 // where zone information is included on the nodes, it favors nodes
 // in zones with fewer existing matching pods.
 func (s *SelectorSpread) CalculateSpreadPriorityReduce(pod *v1.Pod, meta interface{}, nodeNameToInfo map[string]*schedulernodeinfo.NodeInfo, result schedulerapi.HostPriorityList) error {
-	countsByZone := make(map[string]int, 10)
-	maxCountByZone := int(0)
-	maxCountByNodeName := int(0)
+	countsByZone := make(map[string]int64, 10)
+	maxCountByZone := int64(0)
+	maxCountByNodeName := int64(0)
 
 	for i := range result {
 		if result[i].Score > maxCountByNodeName {
@@ -141,10 +141,10 @@ func (s *SelectorSpread) CalculateSpreadPriorityReduce(pod *v1.Pod, meta interfa
 				fScore = (fScore * (1.0 - zoneWeighting)) + (zoneWeighting * zoneScore)
 			}
 		}
-		result[i].Score = int(fScore)
+		result[i].Score = int64(fScore)
 		if klog.V(10) {
 			klog.Infof(
-				"%v -> %v: SelectorSpreadPriority, Score: (%d)", pod.Name, result[i].Host, int(fScore),
+				"%v -> %v: SelectorSpreadPriority, Score: (%d)", pod.Name, result[i].Host, int64(fScore),
 			)
 		}
 	}
@@ -232,16 +232,16 @@ func (s *ServiceAntiAffinity) CalculateAntiAffinityPriorityMap(pod *v1.Pod, meta
 
 	return schedulerapi.HostPriority{
 		Host:  node.Name,
-		Score: score,
+		Score: int64(score),
 	}, nil
 }
 
 // CalculateAntiAffinityPriorityReduce computes each node score with the same value for a particular label.
 // The label to be considered is provided to the struct (ServiceAntiAffinity).
 func (s *ServiceAntiAffinity) CalculateAntiAffinityPriorityReduce(pod *v1.Pod, meta interface{}, nodeNameToInfo map[string]*schedulernodeinfo.NodeInfo, result schedulerapi.HostPriorityList) error {
-	var numServicePods int
+	var numServicePods int64
 	var label string
-	podCounts := map[string]int{}
+	podCounts := map[string]int64{}
 	labelNodesStatus := map[string]string{}
 	maxPriorityFloat64 := float64(schedulerapi.MaxPriority)
 
@@ -261,7 +261,7 @@ func (s *ServiceAntiAffinity) CalculateAntiAffinityPriorityReduce(pod *v1.Pod, m
 		label, ok := labelNodesStatus[hostPriority.Host]
 		if !ok {
 			result[i].Host = hostPriority.Host
-			result[i].Score = int(0)
+			result[i].Score = 0
 			continue
 		}
 		// initializing to the default/max node score of maxPriority
@@ -270,7 +270,7 @@ func (s *ServiceAntiAffinity) CalculateAntiAffinityPriorityReduce(pod *v1.Pod, m
 			fScore = maxPriorityFloat64 * (float64(numServicePods-podCounts[label]) / float64(numServicePods))
 		}
 		result[i].Host = hostPriority.Host
-		result[i].Score = int(fScore)
+		result[i].Score = int64(fScore)
 	}
 
 	return nil
diff --git a/pkg/scheduler/algorithm/priorities/taint_toleration.go b/pkg/scheduler/algorithm/priorities/taint_toleration.go
@@ -68,7 +68,7 @@ func ComputeTaintTolerationPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *
 
 	return schedulerapi.HostPriority{
 		Host:  node.Name,
-		Score: countIntolerableTaintsPreferNoSchedule(node.Spec.Taints, tolerationsPreferNoSchedule),
+		Score: int64(countIntolerableTaintsPreferNoSchedule(node.Spec.Taints, tolerationsPreferNoSchedule)),
 	}, nil
 }
 
diff --git a/pkg/scheduler/algorithm/priorities/types.go b/pkg/scheduler/algorithm/priorities/types.go
@@ -50,7 +50,7 @@ type PriorityConfig struct {
 	// TODO: Remove it after migrating all functions to
 	// Map-Reduce pattern.
 	Function PriorityFunction
-	Weight   int
+	Weight   int64
 }
 
 // EmptyPriorityMetadataProducer returns a no-op PriorityMetadataProducer type.
diff --git a/pkg/scheduler/algorithm/scheduler_interface.go b/pkg/scheduler/algorithm/scheduler_interface.go
@@ -39,7 +39,7 @@ type SchedulerExtender interface {
 	// Prioritize based on extender-implemented priority functions. The returned scores & weight
 	// are used to compute the weighted score for an extender. The weighted scores are added to
 	// the scores computed  by Kubernetes scheduler. The total scores are used to do the host selection.
-	Prioritize(pod *v1.Pod, nodes []*v1.Node) (hostPriorities *schedulerapi.HostPriorityList, weight int, err error)
+	Prioritize(pod *v1.Pod, nodes []*v1.Node) (hostPriorities *schedulerapi.HostPriorityList, weight int64, err error)
 
 	// Bind delegates the action of binding a pod to a node to the extender.
 	Bind(binding *v1.Binding) error
diff --git a/pkg/scheduler/api/types.go b/pkg/scheduler/api/types.go
@@ -17,6 +17,7 @@ limitations under the License.
 package api
 
 import (
+	"math"
 	"time"
 
 	v1 "k8s.io/api/core/v1"
@@ -30,11 +31,11 @@ const (
 	// MaxInt defines the max signed int value.
 	MaxInt = int(MaxUint >> 1)
 	// MaxTotalPriority defines the max total priority value.
-	MaxTotalPriority = MaxInt
+	MaxTotalPriority = int64(math.MaxInt64)
 	// MaxPriority defines the max priority value.
 	MaxPriority = 10
 	// MaxWeight defines the max weight value.
-	MaxWeight = MaxInt / MaxPriority
+	MaxWeight = int64(math.MaxInt64 / MaxPriority)
 	// DefaultPercentageOfNodesToScore defines the percentage of nodes of all nodes
 	// that once found feasible, the scheduler stops looking for more nodes.
 	DefaultPercentageOfNodesToScore = 50
@@ -86,7 +87,7 @@ type PriorityPolicy struct {
 	Name string
 	// The numeric multiplier for the node scores that the priority function generates
 	// The weight should be a positive integer
-	Weight int
+	Weight int64
 	// Holds the parameters to configure the given priority function
 	Argument *PriorityArgument
 }
@@ -157,17 +158,17 @@ type RequestedToCapacityRatioArguments struct {
 // UtilizationShapePoint represents single point of priority function shape
 type UtilizationShapePoint struct {
 	// Utilization (x axis). Valid values are 0 to 100. Fully utilized node maps to 100.
-	Utilization int
+	Utilization int32
 	// Score assigned to given utilization (y axis). Valid values are 0 to 10.
-	Score int
+	Score int32
 }
 
 // ResourceSpec represents single resource for bin packing of priority RequestedToCapacityRatioArguments.
 type ResourceSpec struct {
 	// Name of the resource to be managed by RequestedToCapacityRatio function.
 	Name v1.ResourceName
 	// Weight of the resource.
-	Weight int
+	Weight int64
 }
 
 // ExtenderManagedResource describes the arguments of extended resources
@@ -220,7 +221,7 @@ type ExtenderConfig struct {
 	PrioritizeVerb string
 	// The numeric multiplier for the node scores that the prioritize call generates.
 	// The weight should be a positive integer
-	Weight int
+	Weight int64
 	// Verb for the bind call, empty if not supported. This verb is appended to the URLPrefix when issuing the bind call to extender.
 	// If this method is implemented by the extender, it is the extender's responsibility to bind the pod to apiserver. Only one extender
 	// can implement this function.
@@ -271,7 +272,7 @@ type ExtenderPreemptionArgs struct {
 //   numPDBViolations: the count of violations of PodDisruptionBudget
 type Victims struct {
 	Pods             []*v1.Pod
-	NumPDBViolations int
+	NumPDBViolations int64
 }
 
 // MetaPod represent identifier for a v1.Pod
@@ -285,7 +286,7 @@ type MetaPod struct {
 //   numPDBViolations: the count of violations of PodDisruptionBudget
 type MetaVictims struct {
 	Pods             []*MetaPod
-	NumPDBViolations int
+	NumPDBViolations int64
 }
 
 // ExtenderArgs represents the arguments needed by the extender to filter/prioritize
@@ -341,7 +342,7 @@ type HostPriority struct {
 	// Name of the host
 	Host string
 	// Score associated with the host
-	Score int
+	Score int64
 }
 
 // HostPriorityList declares a []HostPriority type.
diff --git a/pkg/scheduler/api/v1/types.go b/pkg/scheduler/api/v1/types.go
@@ -39,7 +39,7 @@ type Policy struct {
 	// RequiredDuringScheduling affinity is not symmetric, but there is an implicit PreferredDuringScheduling affinity rule
 	// corresponding to every RequiredDuringScheduling affinity rule.
 	// HardPodAffinitySymmetricWeight represents the weight of implicit PreferredDuringScheduling affinity rule, in the range 1-100.
-	HardPodAffinitySymmetricWeight int `json:"hardPodAffinitySymmetricWeight"`
+	HardPodAffinitySymmetricWeight int32 `json:"hardPodAffinitySymmetricWeight"`
 
 	// When AlwaysCheckAllPredicates is set to true, scheduler checks all
 	// the configured predicates even after one or more of them fails.
@@ -66,7 +66,7 @@ type PriorityPolicy struct {
 	Name string `json:"name"`
 	// The numeric multiplier for the node scores that the priority function generates
 	// The weight should be non-zero and can be a positive or a negative integer
-	Weight int `json:"weight"`
+	Weight int64 `json:"weight"`
 	// Holds the parameters to configure the given priority function
 	Argument *PriorityArgument `json:"argument"`
 }
@@ -137,17 +137,17 @@ type RequestedToCapacityRatioArguments struct {
 // UtilizationShapePoint represents single point of priority function shape.
 type UtilizationShapePoint struct {
 	// Utilization (x axis). Valid values are 0 to 100. Fully utilized node maps to 100.
-	Utilization int `json:"utilization"`
+	Utilization int32 `json:"utilization"`
 	// Score assigned to given utilization (y axis). Valid values are 0 to 10.
-	Score int `json:"score"`
+	Score int32 `json:"score"`
 }
 
 // ResourceSpec represents single resource and weight for bin packing of priority RequestedToCapacityRatioArguments.
 type ResourceSpec struct {
 	// Name of the resource to be managed by RequestedToCapacityRatio function.
 	Name apiv1.ResourceName `json:"name,casttype=ResourceName"`
 	// Weight of the resource.
-	Weight int `json:"weight,omitempty"`
+	Weight int64 `json:"weight,omitempty"`
 }
 
 // ExtenderManagedResource describes the arguments of extended resources
@@ -200,7 +200,7 @@ type ExtenderConfig struct {
 	PrioritizeVerb string `json:"prioritizeVerb,omitempty"`
 	// The numeric multiplier for the node scores that the prioritize call generates.
 	// The weight should be a positive integer
-	Weight int `json:"weight,omitempty"`
+	Weight int64 `json:"weight,omitempty"`
 	// Verb for the bind call, empty if not supported. This verb is appended to the URLPrefix when issuing the bind call to extender.
 	// If this method is implemented by the extender, it is the extender's responsibility to bind the pod to apiserver. Only one extender
 	// can implement this function.
@@ -276,7 +276,7 @@ type ExtenderPreemptionArgs struct {
 //   numPDBViolations: the count of violations of PodDisruptionBudget
 type Victims struct {
 	Pods             []*apiv1.Pod `json:"pods"`
-	NumPDBViolations int          `json:"numPDBViolations"`
+	NumPDBViolations int64        `json:"numPDBViolations"`
 }
 
 // MetaPod represent identifier for a v1.Pod
@@ -290,7 +290,7 @@ type MetaPod struct {
 //   numPDBViolations: the count of violations of PodDisruptionBudget
 type MetaVictims struct {
 	Pods             []*MetaPod `json:"pods"`
-	NumPDBViolations int        `json:"numPDBViolations"`
+	NumPDBViolations int64      `json:"numPDBViolations"`
 }
 
 // FailedNodesMap represents the filtered out nodes, with node names and failure messages
@@ -333,7 +333,7 @@ type HostPriority struct {
 	// Name of the host
 	Host string `json:"host"`
 	// Score associated with the host
-	Score int `json:"score"`
+	Score int64 `json:"score"`
 }
 
 // HostPriorityList declares a []HostPriority type.
diff --git a/pkg/scheduler/core/extender.go b/pkg/scheduler/core/extender.go
@@ -45,7 +45,7 @@ type HTTPExtender struct {
 	filterVerb       string
 	prioritizeVerb   string
 	bindVerb         string
-	weight           int
+	weight           int64
 	client           *http.Client
 	nodeCacheCapable bool
 	managedResources sets.String
@@ -321,7 +321,7 @@ func (h *HTTPExtender) Filter(
 // Prioritize based on extender implemented priority functions. Weight*priority is added
 // up for each such priority function. The returned score is added to the score computed
 // by Kubernetes scheduler. The total score is used to do the host selection.
-func (h *HTTPExtender) Prioritize(pod *v1.Pod, nodes []*v1.Node) (*schedulerapi.HostPriorityList, int, error) {
+func (h *HTTPExtender) Prioritize(pod *v1.Pod, nodes []*v1.Node) (*schedulerapi.HostPriorityList, int64, error) {
 	var (
 		result    schedulerapi.HostPriorityList
 		nodeList  *v1.NodeList
diff --git a/pkg/scheduler/core/extender_test.go b/pkg/scheduler/core/extender_test.go
diff --git a/pkg/scheduler/core/generic_scheduler.go b/pkg/scheduler/core/generic_scheduler.go
diff --git a/pkg/scheduler/core/generic_scheduler_test.go b/pkg/scheduler/core/generic_scheduler_test.go
diff --git a/pkg/scheduler/factory/factory_test.go b/pkg/scheduler/factory/factory_test.go
diff --git a/pkg/scheduler/factory/plugins.go b/pkg/scheduler/factory/plugins.go
diff --git a/pkg/scheduler/factory/plugins_test.go b/pkg/scheduler/factory/plugins_test.go
diff --git a/test/integration/scheduler/extender_test.go b/test/integration/scheduler/extender_test.go

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ func CalculateEvenPodsSpreadPriority(pod v1.Pod, nodeNameToInfo map[string]sch`
`176`	`176`	`// debugging purpose: print the value for each node`
`177`	`177`	`// score must be pointer here, otherwise it's always 0`
`178`	`178`	`if klog.V(10) {`
`179`		`- defer func(score *int, nodeName string) {`
	`179`	`+ defer func(score *int64, nodeName string) {`
`180`	`180`	`klog.Infof("%v -> %v: EvenPodsSpreadPriority, Score: (%d)", pod.Name, nodeName, *score)`
`181`	`181`	`}(&result[i].Score, node.Name)`
`182`	`182`	`}`
`@@ -190,7 +190,7 @@ func CalculateEvenPodsSpreadPriority(pod v1.Pod, nodeNameToInfo map[string]sch`
`190`	`190`	`continue`
`191`	`191`	`}`
`192`	`192`	`fScore := float64(schedulerapi.MaxPriority) * (float64(total-t.nodeNameToPodCounts[node.Name]) / float64(maxMinDiff))`
`193`		`- result[i].Score = int(fScore)`
	`193`	`+ result[i].Score = int64(fScore)`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`return result, nil`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func ImageLocalityPriorityMap(pod v1.Pod, meta interface{}, nodeInfo scheduler`
`55`	`55`
`56`	`56`	`return schedulerapi.HostPriority{`
`57`	`57`	`Host: node.Name,`
`58`		`- Score: score,`
	`58`	`+ Score: int64(score),`
`59`	`59`	`}, nil`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ func (ipa InterPodAffinity) CalculateInterPodAffinityPriority(pod v1.Pod, node`
`236`	`236`	`if maxMinDiff > 0 && pm.counts[node.Name] != nil {`
`237`	`237`	`fScore = float64(schedulerapi.MaxPriority) * (float64(*pm.counts[node.Name]-minCount) / float64(maxCount-minCount))`
`238`	`238`	`}`
`239`		`- result = append(result, schedulerapi.HostPriority{Host: node.Name, Score: int(fScore)})`
	`239`	`+ result = append(result, schedulerapi.HostPriority{Host: node.Name, Score: int64(fScore)})`
`240`	`240`	`if klog.V(10) {`
`241`	`241`	`klog.Infof("%v -> %v: InterPodAffinityPriority, Score: (%d)", pod.Name, node.Name, int(fScore))`
`242`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func CalculateNodeAffinityPriorityMap(pod v1.Pod, meta interface{}, nodeInfo s`
`69`	`69`
`70`	`70`	`return schedulerapi.HostPriority{`
`71`	`71`	`Host: node.Name,`
`72`		`- Score: int(count),`
	`72`	`+ Score: int64(count),`
`73`	`73`	`}, nil`
`74`	`74`	`}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,6 @@ func (n NodeLabelPrioritizer) CalculateNodeLabelPriorityMap(pod v1.Pod, meta i`
`56`	`56`	`}`
`57`	`57`	`return schedulerapi.HostPriority{`
`58`	`58`	`Host: node.Name,`
`59`		`- Score: score,`
	`59`	`+ Score: int64(score),`
`60`	`60`	`}, nil`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func (r *ResourceAllocationPriority) PriorityMap(`
`92`	`92`
`93`	`93`	`return schedulerapi.HostPriority{`
`94`	`94`	`Host: node.Name,`
`95`		`- Score: int(score),`
	`95`	`+ Score: score,`
`96`	`96`	`}, nil`
`97`	`97`	`}`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func ResourceLimitsPriorityMap(pod v1.Pod, meta interface{}, nodeInfo schedule`
`54`	`54`	`cpuScore := computeScore(podLimits.MilliCPU, allocatableResources.MilliCPU)`
`55`	`55`	`memScore := computeScore(podLimits.Memory, allocatableResources.Memory)`
`56`	`56`
`57`		`- score := int(0)`
	`57`	`+ score := int64(0)`
`58`	`58`	`if cpuScore == 1 \|\| memScore == 1 {`
`59`	`59`	`score = 1`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func ComputeTaintTolerationPriorityMap(pod v1.Pod, meta interface{}, nodeInfo `
`68`	`68`
`69`	`69`	`return schedulerapi.HostPriority{`
`70`	`70`	`Host: node.Name,`
`71`		`- Score: countIntolerableTaintsPreferNoSchedule(node.Spec.Taints, tolerationsPreferNoSchedule),`
	`71`	`+ Score: int64(countIntolerableTaintsPreferNoSchedule(node.Spec.Taints, tolerationsPreferNoSchedule)),`
`72`	`72`	`}, nil`
`73`	`73`	`}`
`74`	`74`