Skip to content

K
k3s
Commit f782aba5 authored by Chao Xu's avatar Chao Xu
Browse files
Options

plugin/scheduler

parent 5e1adf91
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 663 additions and 663 deletions
plugin/cmd/kube-scheduler/app/server.go
View file @ f782aba5
...@@ -26,9 +26,9 @@ import ( ...@@ -26,9 +26,9 @@ import (
"os" "os"
"strconv" "strconv"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1"
"k8s.io/kubernetes/pkg/client/leaderelection" "k8s.io/kubernetes/pkg/client/leaderelection"
"k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock"
"k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/record"
...@@ -122,9 +122,9 @@ func Run(s *options.SchedulerServer) error { ...@@ -122,9 +122,9 @@ func Run(s *options.SchedulerServer) error {
} }
eventBroadcaster := record.NewBroadcaster() eventBroadcaster := record.NewBroadcaster()
config.Recorder = eventBroadcaster.NewRecorder(api.EventSource{Component: s.SchedulerName}) config.Recorder = eventBroadcaster.NewRecorder(v1.EventSource{Component: s.SchedulerName})
eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartLogging(glog.Infof)
eventBroadcaster.StartRecordingToSink(&unversionedcore.EventSinkImpl{Interface: leaderElectionClient.Core().Events("")}) eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: leaderElectionClient.Core().Events("")})
sched := scheduler.New(config) sched := scheduler.New(config)
...@@ -147,7 +147,7 @@ func Run(s *options.SchedulerServer) error { ...@@ -147,7 +147,7 @@ func Run(s *options.SchedulerServer) error {
// TODO: enable other lock types // TODO: enable other lock types
rl := resourcelock.EndpointsLock{ rl := resourcelock.EndpointsLock{
EndpointsMeta: api.ObjectMeta{ EndpointsMeta: v1.ObjectMeta{
Namespace: "kube-system", Namespace: "kube-system",
Name: "kube-scheduler", Name: "kube-scheduler",
}, },
......
plugin/pkg/scheduler/algorithm/listers.go
View file @ f782aba5
...@@ -19,39 +19,39 @@ package algorithm ...@@ -19,39 +19,39 @@ package algorithm
import ( import (
"fmt" "fmt"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/api/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
) )
// NodeLister interface represents anything that can list nodes for a scheduler. // NodeLister interface represents anything that can list nodes for a scheduler.
type NodeLister interface { type NodeLister interface {
// We explicitly return []*api.Node, instead of api.NodeList, to avoid // We explicitly return []*v1.Node, instead of v1.NodeList, to avoid
// performing expensive copies that are unneded. // performing expensive copies that are unneded.
List() ([]*api.Node, error) List() ([]*v1.Node, error)
} }
// FakeNodeLister implements NodeLister on a []string for test purposes. // FakeNodeLister implements NodeLister on a []string for test purposes.
type FakeNodeLister []*api.Node type FakeNodeLister []*v1.Node
// List returns nodes as a []string. // List returns nodes as a []string.
func (f FakeNodeLister) List() ([]*api.Node, error) { func (f FakeNodeLister) List() ([]*v1.Node, error) {
return f, nil return f, nil
} }
// PodLister interface represents anything that can list pods for a scheduler. // PodLister interface represents anything that can list pods for a scheduler.
type PodLister interface { type PodLister interface {
// We explicitly return []*api.Pod, instead of api.PodList, to avoid // We explicitly return []*v1.Pod, instead of v1.PodList, to avoid
// performing expensive copies that are unneded. // performing expensive copies that are unneded.
List(labels.Selector) ([]*api.Pod, error) List(labels.Selector) ([]*v1.Pod, error)
} }
// FakePodLister implements PodLister on an []api.Pods for test purposes. // FakePodLister implements PodLister on an []v1.Pods for test purposes.
type FakePodLister []*api.Pod type FakePodLister []*v1.Pod
// List returns []*api.Pod matching a query. // List returns []*v1.Pod matching a query.
func (f FakePodLister) List(s labels.Selector) (selected []*api.Pod, err error) { func (f FakePodLister) List(s labels.Selector) (selected []*v1.Pod, err error) {
for _, pod := range f { for _, pod := range f {
if s.Matches(labels.Set(pod.Labels)) { if s.Matches(labels.Set(pod.Labels)) {
selected = append(selected, pod) selected = append(selected, pod)
...@@ -63,21 +63,21 @@ func (f FakePodLister) List(s labels.Selector) (selected []*api.Pod, err error) ...@@ -63,21 +63,21 @@ func (f FakePodLister) List(s labels.Selector) (selected []*api.Pod, err error)
// ServiceLister interface represents anything that can produce a list of services; the list is consumed by a scheduler. // ServiceLister interface represents anything that can produce a list of services; the list is consumed by a scheduler.
type ServiceLister interface { type ServiceLister interface {
// Lists all the services // Lists all the services
List(labels.Selector) ([]*api.Service, error) List(labels.Selector) ([]*v1.Service, error)
// Gets the services for the given pod // Gets the services for the given pod
GetPodServices(*api.Pod) ([]*api.Service, error) GetPodServices(*v1.Pod) ([]*v1.Service, error)
} }
// FakeServiceLister implements ServiceLister on []api.Service for test purposes. // FakeServiceLister implements ServiceLister on []v1.Service for test purposes.
type FakeServiceLister []*api.Service type FakeServiceLister []*v1.Service
// List returns api.ServiceList, the list of all services. // List returns v1.ServiceList, the list of all services.
func (f FakeServiceLister) List(labels.Selector) ([]*api.Service, error) { func (f FakeServiceLister) List(labels.Selector) ([]*v1.Service, error) {
return f, nil return f, nil
} }
// GetPodServices gets the services that have the selector that match the labels on the given pod. // GetPodServices gets the services that have the selector that match the labels on the given pod.
func (f FakeServiceLister) GetPodServices(pod *api.Pod) (services []*api.Service, err error) { func (f FakeServiceLister) GetPodServices(pod *v1.Pod) (services []*v1.Service, err error) {
var selector labels.Selector var selector labels.Selector
for i := range f { for i := range f {
...@@ -97,34 +97,34 @@ func (f FakeServiceLister) GetPodServices(pod *api.Pod) (services []*api.Service ...@@ -97,34 +97,34 @@ func (f FakeServiceLister) GetPodServices(pod *api.Pod) (services []*api.Service
// ControllerLister interface represents anything that can produce a list of ReplicationController; the list is consumed by a scheduler. // ControllerLister interface represents anything that can produce a list of ReplicationController; the list is consumed by a scheduler.
type ControllerLister interface { type ControllerLister interface {
// Lists all the replication controllers // Lists all the replication controllers
List(labels.Selector) ([]*api.ReplicationController, error) List(labels.Selector) ([]*v1.ReplicationController, error)
// Gets the services for the given pod // Gets the services for the given pod
GetPodControllers(*api.Pod) ([]*api.ReplicationController, error) GetPodControllers(*v1.Pod) ([]*v1.ReplicationController, error)
} }
// EmptyControllerLister implements ControllerLister on []api.ReplicationController returning empty data // EmptyControllerLister implements ControllerLister on []v1.ReplicationController returning empty data
type EmptyControllerLister struct{} type EmptyControllerLister struct{}
// List returns nil // List returns nil
func (f EmptyControllerLister) List(labels.Selector) ([]*api.ReplicationController, error) { func (f EmptyControllerLister) List(labels.Selector) ([]*v1.ReplicationController, error) {
return nil, nil return nil, nil
} }
// GetPodControllers returns nil // GetPodControllers returns nil
func (f EmptyControllerLister) GetPodControllers(pod *api.Pod) (controllers []*api.ReplicationController, err error) { func (f EmptyControllerLister) GetPodControllers(pod *v1.Pod) (controllers []*v1.ReplicationController, err error) {
return nil, nil return nil, nil
} }
// FakeControllerLister implements ControllerLister on []api.ReplicationController for test purposes. // FakeControllerLister implements ControllerLister on []v1.ReplicationController for test purposes.
type FakeControllerLister []*api.ReplicationController type FakeControllerLister []*v1.ReplicationController
// List returns []api.ReplicationController, the list of all ReplicationControllers. // List returns []v1.ReplicationController, the list of all ReplicationControllers.
func (f FakeControllerLister) List(labels.Selector) ([]*api.ReplicationController, error) { func (f FakeControllerLister) List(labels.Selector) ([]*v1.ReplicationController, error) {
return f, nil return f, nil
} }
// GetPodControllers gets the ReplicationControllers that have the selector that match the labels on the given pod // GetPodControllers gets the ReplicationControllers that have the selector that match the labels on the given pod
func (f FakeControllerLister) GetPodControllers(pod *api.Pod) (controllers []*api.ReplicationController, err error) { func (f FakeControllerLister) GetPodControllers(pod *v1.Pod) (controllers []*v1.ReplicationController, err error) {
var selector labels.Selector var selector labels.Selector
for i := range f { for i := range f {
...@@ -147,14 +147,14 @@ func (f FakeControllerLister) GetPodControllers(pod *api.Pod) (controllers []*ap ...@@ -147,14 +147,14 @@ func (f FakeControllerLister) GetPodControllers(pod *api.Pod) (controllers []*ap
// ReplicaSetLister interface represents anything that can produce a list of ReplicaSet; the list is consumed by a scheduler. // ReplicaSetLister interface represents anything that can produce a list of ReplicaSet; the list is consumed by a scheduler.
type ReplicaSetLister interface { type ReplicaSetLister interface {
// Gets the replicasets for the given pod // Gets the replicasets for the given pod
GetPodReplicaSets(*api.Pod) ([]*extensions.ReplicaSet, error) GetPodReplicaSets(*v1.Pod) ([]*extensions.ReplicaSet, error)
} }
// EmptyReplicaSetLister implements ReplicaSetLister on []extensions.ReplicaSet returning empty data // EmptyReplicaSetLister implements ReplicaSetLister on []extensions.ReplicaSet returning empty data
type EmptyReplicaSetLister struct{} type EmptyReplicaSetLister struct{}
// GetPodReplicaSets returns nil // GetPodReplicaSets returns nil
func (f EmptyReplicaSetLister) GetPodReplicaSets(pod *api.Pod) (rss []*extensions.ReplicaSet, err error) { func (f EmptyReplicaSetLister) GetPodReplicaSets(pod *v1.Pod) (rss []*extensions.ReplicaSet, err error) {
return nil, nil return nil, nil
} }
...@@ -162,7 +162,7 @@ func (f EmptyReplicaSetLister) GetPodReplicaSets(pod *api.Pod) (rss []*extension ...@@ -162,7 +162,7 @@ func (f EmptyReplicaSetLister) GetPodReplicaSets(pod *api.Pod) (rss []*extension
type FakeReplicaSetLister []*extensions.ReplicaSet type FakeReplicaSetLister []*extensions.ReplicaSet
// GetPodReplicaSets gets the ReplicaSets that have the selector that match the labels on the given pod // GetPodReplicaSets gets the ReplicaSets that have the selector that match the labels on the given pod
func (f FakeReplicaSetLister) GetPodReplicaSets(pod *api.Pod) (rss []*extensions.ReplicaSet, err error) { func (f FakeReplicaSetLister) GetPodReplicaSets(pod *v1.Pod) (rss []*extensions.ReplicaSet, err error) {
var selector labels.Selector var selector labels.Selector
for _, rs := range f { for _, rs := range f {
......
plugin/pkg/scheduler/algorithm/predicates/error.go
View file @ f782aba5
...@@ -19,7 +19,7 @@ package predicates ...@@ -19,7 +19,7 @@ package predicates
import ( import (
"fmt" "fmt"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
) )
var ( var (
...@@ -46,13 +46,13 @@ var ( ...@@ -46,13 +46,13 @@ var (
// hit and caused the unfitting failure. // hit and caused the unfitting failure.
type InsufficientResourceError struct { type InsufficientResourceError struct {
// resourceName is the name of the resource that is insufficient // resourceName is the name of the resource that is insufficient
ResourceName api.ResourceName ResourceName v1.ResourceName
requested int64 requested int64
used int64 used int64
capacity int64 capacity int64
} }
func NewInsufficientResourceError(resourceName api.ResourceName, requested, used, capacity int64) *InsufficientResourceError { func NewInsufficientResourceError(resourceName v1.ResourceName, requested, used, capacity int64) *InsufficientResourceError {
return &InsufficientResourceError{ return &InsufficientResourceError{
ResourceName: resourceName, ResourceName: resourceName,
requested: requested, requested: requested,
......
plugin/pkg/scheduler/algorithm/predicates/metadata.go
View file @ f782aba5
...@@ -18,7 +18,7 @@ package predicates ...@@ -18,7 +18,7 @@ package predicates
import ( import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
...@@ -35,7 +35,7 @@ func NewPredicateMetadataFactory(podLister algorithm.PodLister) algorithm.Metada ...@@ -35,7 +35,7 @@ func NewPredicateMetadataFactory(podLister algorithm.PodLister) algorithm.Metada
} }
// GetMetadata returns the predicateMetadata used which will be used by various predicates. // GetMetadata returns the predicateMetadata used which will be used by various predicates.
func (pfactory *PredicateMetadataFactory) GetMetadata(pod *api.Pod, nodeNameToInfoMap map[string]*schedulercache.NodeInfo) interface{} { func (pfactory *PredicateMetadataFactory) GetMetadata(pod *v1.Pod, nodeNameToInfoMap map[string]*schedulercache.NodeInfo) interface{} {
// If we cannot compute metadata, just return nil // If we cannot compute metadata, just return nil
if pod == nil { if pod == nil {
return nil return nil
......
plugin/pkg/scheduler/algorithm/predicates/utils.go
View file @ f782aba5
...@@ -16,8 +16,10 @@ limitations under the License. ...@@ -16,8 +16,10 @@ limitations under the License.
package predicates package predicates
import "k8s.io/kubernetes/pkg/labels" import (
import "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/labels"
)
// FindLabelsInSet gets as many key/value pairs as possible out of a label set. // FindLabelsInSet gets as many key/value pairs as possible out of a label set.
func FindLabelsInSet(labelsToKeep []string, selector labels.Set) map[string]string { func FindLabelsInSet(labelsToKeep []string, selector labels.Set) map[string]string {
...@@ -45,8 +47,8 @@ func AddUnsetLabelsToMap(aL map[string]string, labelsToAdd []string, labelSet la ...@@ -45,8 +47,8 @@ func AddUnsetLabelsToMap(aL map[string]string, labelsToAdd []string, labelSet la
} }
// FilterPodsByNamespace filters pods outside a namespace from the given list. // FilterPodsByNamespace filters pods outside a namespace from the given list.
func FilterPodsByNamespace(pods []*api.Pod, ns string) []*api.Pod { func FilterPodsByNamespace(pods []*v1.Pod, ns string) []*v1.Pod {
filtered := []*api.Pod{} filtered := []*v1.Pod{}
for _, nsPod := range pods { for _, nsPod := range pods {
if nsPod.Namespace == ns { if nsPod.Namespace == ns {
filtered = append(filtered, nsPod) filtered = append(filtered, nsPod)
......
plugin/pkg/scheduler/algorithm/predicates/utils_test.go
View file @ f782aba5
...@@ -19,7 +19,7 @@ package predicates ...@@ -19,7 +19,7 @@ package predicates
import ( import (
"fmt" "fmt"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
) )
...@@ -30,9 +30,9 @@ func ExampleFindLabelsInSet() { ...@@ -30,9 +30,9 @@ func ExampleFindLabelsInSet() {
labelSubset["label2"] = "value2" labelSubset["label2"] = "value2"
// Lets make believe that these pods are on the cluster. // Lets make believe that these pods are on the cluster.
// Utility functions will inspect their labels, filter them, and so on. // Utility functions will inspect their labels, filter them, and so on.
nsPods := []*api.Pod{ nsPods := []*v1.Pod{
{ {
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Name: "pod1", Name: "pod1",
Namespace: "ns1", Namespace: "ns1",
Labels: map[string]string{ Labels: map[string]string{
...@@ -43,14 +43,14 @@ func ExampleFindLabelsInSet() { ...@@ -43,14 +43,14 @@ func ExampleFindLabelsInSet() {
}, },
}, // first pod which will be used via the utilities }, // first pod which will be used via the utilities
{ {
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Name: "pod2", Name: "pod2",
Namespace: "ns1", Namespace: "ns1",
}, },
}, },
{ {
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Name: "pod3ThatWeWontSee", Name: "pod3ThatWeWontSee",
}, },
}, },
......
plugin/pkg/scheduler/algorithm/priorities/balanced_resource_allocation.go
View file @ f782aba5
...@@ -20,7 +20,7 @@ import ( ...@@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"math" "math"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
...@@ -37,7 +37,7 @@ const ( ...@@ -37,7 +37,7 @@ const (
// Also used in most/least_requested nad metadata. // Also used in most/least_requested nad metadata.
// TODO: despaghettify it // TODO: despaghettify it
func getNonZeroRequests(pod *api.Pod) *schedulercache.Resource { func getNonZeroRequests(pod *v1.Pod) *schedulercache.Resource {
result := &schedulercache.Resource{} result := &schedulercache.Resource{}
for i := range pod.Spec.Containers { for i := range pod.Spec.Containers {
container := &pod.Spec.Containers[i] container := &pod.Spec.Containers[i]
...@@ -48,7 +48,7 @@ func getNonZeroRequests(pod *api.Pod) *schedulercache.Resource { ...@@ -48,7 +48,7 @@ func getNonZeroRequests(pod *api.Pod) *schedulercache.Resource {
return result return result
} }
func calculateBalancedResourceAllocation(pod *api.Pod, podRequests *schedulercache.Resource, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) { func calculateBalancedResourceAllocation(pod *v1.Pod, podRequests *schedulercache.Resource, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) {
node := nodeInfo.Node() node := nodeInfo.Node()
if node == nil { if node == nil {
return schedulerapi.HostPriority{}, fmt.Errorf("node not found") return schedulerapi.HostPriority{}, fmt.Errorf("node not found")
...@@ -104,7 +104,7 @@ func fractionOfCapacity(requested, capacity int64) float64 { ...@@ -104,7 +104,7 @@ func fractionOfCapacity(requested, capacity int64) float64 {
// close the two metrics are to each other. // close the two metrics are to each other.
// Detail: score = 10 - abs(cpuFraction-memoryFraction)*10. The algorithm is partly inspired by: // Detail: score = 10 - abs(cpuFraction-memoryFraction)*10. The algorithm is partly inspired by:
// "Wei Huang et al. An Energy Efficient Virtual Machine Placement Algorithm with Balanced Resource Utilization" // "Wei Huang et al. An Energy Efficient Virtual Machine Placement Algorithm with Balanced Resource Utilization"
func BalancedResourceAllocationMap(pod *api.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) { func BalancedResourceAllocationMap(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) {
var nonZeroRequest *schedulercache.Resource var nonZeroRequest *schedulercache.Resource
if priorityMeta, ok := meta.(*priorityMetadata); ok { if priorityMeta, ok := meta.(*priorityMetadata); ok {
nonZeroRequest = priorityMeta.nonZeroRequest nonZeroRequest = priorityMeta.nonZeroRequest
......
plugin/pkg/scheduler/algorithm/priorities/balanced_resource_allocation_test.go
View file @ f782aba5
...@@ -20,8 +20,8 @@ import ( ...@@ -20,8 +20,8 @@ import (
"reflect" "reflect"
"testing" "testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
...@@ -35,29 +35,29 @@ func TestBalancedResourceAllocation(t *testing.T) { ...@@ -35,29 +35,29 @@ func TestBalancedResourceAllocation(t *testing.T) {
"bar": "foo", "bar": "foo",
"baz": "blah", "baz": "blah",
} }
machine1Spec := api.PodSpec{ machine1Spec := v1.PodSpec{
NodeName: "machine1", NodeName: "machine1",
} }
machine2Spec := api.PodSpec{ machine2Spec := v1.PodSpec{
NodeName: "machine2", NodeName: "machine2",
} }
noResources := api.PodSpec{ noResources := v1.PodSpec{
Containers: []api.Container{}, Containers: []v1.Container{},
} }
cpuOnly := api.PodSpec{ cpuOnly := v1.PodSpec{
NodeName: "machine1", NodeName: "machine1",
Containers: []api.Container{ Containers: []v1.Container{
{ {
Resources: api.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: api.ResourceList{ Requests: v1.ResourceList{
"cpu": resource.MustParse("1000m"), "cpu": resource.MustParse("1000m"),
"memory": resource.MustParse("0"), "memory": resource.MustParse("0"),
}, },
}, },
}, },
{ {
Resources: api.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: api.ResourceList{ Requests: v1.ResourceList{
"cpu": resource.MustParse("2000m"), "cpu": resource.MustParse("2000m"),
"memory": resource.MustParse("0"), "memory": resource.MustParse("0"),
}, },
...@@ -67,20 +67,20 @@ func TestBalancedResourceAllocation(t *testing.T) { ...@@ -67,20 +67,20 @@ func TestBalancedResourceAllocation(t *testing.T) {
} }
cpuOnly2 := cpuOnly cpuOnly2 := cpuOnly
cpuOnly2.NodeName = "machine2" cpuOnly2.NodeName = "machine2"
cpuAndMemory := api.PodSpec{ cpuAndMemory := v1.PodSpec{
NodeName: "machine2", NodeName: "machine2",
Containers: []api.Container{ Containers: []v1.Container{
{ {
Resources: api.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: api.ResourceList{ Requests: v1.ResourceList{
"cpu": resource.MustParse("1000m"), "cpu": resource.MustParse("1000m"),
"memory": resource.MustParse("2000"), "memory": resource.MustParse("2000"),
}, },
}, },
}, },
{ {
Resources: api.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: api.ResourceList{ Requests: v1.ResourceList{
"cpu": resource.MustParse("2000m"), "cpu": resource.MustParse("2000m"),
"memory": resource.MustParse("3000"), "memory": resource.MustParse("3000"),
}, },
...@@ -89,9 +89,9 @@ func TestBalancedResourceAllocation(t *testing.T) { ...@@ -89,9 +89,9 @@ func TestBalancedResourceAllocation(t *testing.T) {
}, },
} }
tests := []struct { tests := []struct {
pod *api.Pod pod *v1.Pod
pods []*api.Pod pods []*v1.Pod
nodes []*api.Node nodes []*v1.Node
expectedList schedulerapi.HostPriorityList expectedList schedulerapi.HostPriorityList
test string test string
}{ }{
...@@ -107,8 +107,8 @@ func TestBalancedResourceAllocation(t *testing.T) { ...@@ -107,8 +107,8 @@ func TestBalancedResourceAllocation(t *testing.T) {
Memory Fraction: 0 / 10000 = 0% Memory Fraction: 0 / 10000 = 0%
Node2 Score: 10 - (0-0)*10 = 10 Node2 Score: 10 - (0-0)*10 = 10
*/ */
pod: &api.Pod{Spec: noResources}, pod: &v1.Pod{Spec: noResources},
nodes: []*api.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)}, nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 10}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 10}},
test: "nothing scheduled, nothing requested", test: "nothing scheduled, nothing requested",
}, },
...@@ -124,8 +124,8 @@ func TestBalancedResourceAllocation(t *testing.T) { ...@@ -124,8 +124,8 @@ func TestBalancedResourceAllocation(t *testing.T) {
Memory Fraction: 5000/10000 = 50% Memory Fraction: 5000/10000 = 50%
Node2 Score: 10 - (0.5-0.5)*10 = 10 Node2 Score: 10 - (0.5-0.5)*10 = 10
*/ */
pod: &api.Pod{Spec: cpuAndMemory}, pod: &v1.Pod{Spec: cpuAndMemory},
nodes: []*api.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 6000, 10000)}, nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 6000, 10000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 7}, {Host: "machine2", Score: 10}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 7}, {Host: "machine2", Score: 10}},
test: "nothing scheduled, resources requested, differently sized machines", test: "nothing scheduled, resources requested, differently sized machines",
}, },
...@@ -141,15 +141,15 @@ func TestBalancedResourceAllocation(t *testing.T) { ...@@ -141,15 +141,15 @@ func TestBalancedResourceAllocation(t *testing.T) {
Memory Fraction: 0 / 10000 = 0% Memory Fraction: 0 / 10000 = 0%
Node2 Score: 10 - (0-0)*10 = 10 Node2 Score: 10 - (0-0)*10 = 10
*/ */
pod: &api.Pod{Spec: noResources}, pod: &v1.Pod{Spec: noResources},
nodes: []*api.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)}, nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 10}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 10}},
test: "no resources requested, pods scheduled", test: "no resources requested, pods scheduled",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: machine1Spec, ObjectMeta: api.ObjectMeta{Labels: labels2}}, {Spec: machine1Spec, ObjectMeta: v1.ObjectMeta{Labels: labels2}},
{Spec: machine1Spec, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: machine1Spec, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
{Spec: machine2Spec, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: machine2Spec, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
{Spec: machine2Spec, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: machine2Spec, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
}, },
}, },
{ {
...@@ -164,15 +164,15 @@ func TestBalancedResourceAllocation(t *testing.T) { ...@@ -164,15 +164,15 @@ func TestBalancedResourceAllocation(t *testing.T) {
Memory Fraction: 5000 / 20000 = 25% Memory Fraction: 5000 / 20000 = 25%
Node2 Score: 10 - (0.6-0.25)*10 = 6 Node2 Score: 10 - (0.6-0.25)*10 = 6
*/ */
pod: &api.Pod{Spec: noResources}, pod: &v1.Pod{Spec: noResources},
nodes: []*api.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)}, nodes: []*v1.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 4}, {Host: "machine2", Score: 6}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 4}, {Host: "machine2", Score: 6}},
test: "no resources requested, pods scheduled with resources", test: "no resources requested, pods scheduled with resources",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: cpuOnly, ObjectMeta: api.ObjectMeta{Labels: labels2}}, {Spec: cpuOnly, ObjectMeta: v1.ObjectMeta{Labels: labels2}},
{Spec: cpuOnly, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: cpuOnly, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
{Spec: cpuOnly2, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: cpuOnly2, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
{Spec: cpuAndMemory, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: cpuAndMemory, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
}, },
}, },
{ {
...@@ -187,11 +187,11 @@ func TestBalancedResourceAllocation(t *testing.T) { ...@@ -187,11 +187,11 @@ func TestBalancedResourceAllocation(t *testing.T) {
Memory Fraction: 10000 / 20000 = 50% Memory Fraction: 10000 / 20000 = 50%
Node2 Score: 10 - (0.6-0.5)*10 = 9 Node2 Score: 10 - (0.6-0.5)*10 = 9
*/ */
pod: &api.Pod{Spec: cpuAndMemory}, pod: &v1.Pod{Spec: cpuAndMemory},
nodes: []*api.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)}, nodes: []*v1.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 6}, {Host: "machine2", Score: 9}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 6}, {Host: "machine2", Score: 9}},
test: "resources requested, pods scheduled with resources", test: "resources requested, pods scheduled with resources",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: cpuOnly}, {Spec: cpuOnly},
{Spec: cpuAndMemory}, {Spec: cpuAndMemory},
}, },
...@@ -208,11 +208,11 @@ func TestBalancedResourceAllocation(t *testing.T) { ...@@ -208,11 +208,11 @@ func TestBalancedResourceAllocation(t *testing.T) {
Memory Fraction: 10000 / 50000 = 20% Memory Fraction: 10000 / 50000 = 20%
Node2 Score: 10 - (0.6-0.2)*10 = 6 Node2 Score: 10 - (0.6-0.2)*10 = 6
*/ */
pod: &api.Pod{Spec: cpuAndMemory}, pod: &v1.Pod{Spec: cpuAndMemory},
nodes: []*api.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 50000)}, nodes: []*v1.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 50000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 6}, {Host: "machine2", Score: 6}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 6}, {Host: "machine2", Score: 6}},
test: "resources requested, pods scheduled with resources, differently sized machines", test: "resources requested, pods scheduled with resources, differently sized machines",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: cpuOnly}, {Spec: cpuOnly},
{Spec: cpuAndMemory}, {Spec: cpuAndMemory},
}, },
...@@ -229,21 +229,21 @@ func TestBalancedResourceAllocation(t *testing.T) { ...@@ -229,21 +229,21 @@ func TestBalancedResourceAllocation(t *testing.T) {
Memory Fraction 5000 / 10000 = 50% Memory Fraction 5000 / 10000 = 50%
Node2 Score: 0 Node2 Score: 0
*/ */
pod: &api.Pod{Spec: cpuOnly}, pod: &v1.Pod{Spec: cpuOnly},
nodes: []*api.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)}, nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}},
test: "requested resources exceed node capacity", test: "requested resources exceed node capacity",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: cpuOnly}, {Spec: cpuOnly},
{Spec: cpuAndMemory}, {Spec: cpuAndMemory},
}, },
}, },
{ {
pod: &api.Pod{Spec: noResources}, pod: &v1.Pod{Spec: noResources},
nodes: []*api.Node{makeNode("machine1", 0, 0), makeNode("machine2", 0, 0)}, nodes: []*v1.Node{makeNode("machine1", 0, 0), makeNode("machine2", 0, 0)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}},
test: "zero node resources, pods scheduled with resources", test: "zero node resources, pods scheduled with resources",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: cpuOnly}, {Spec: cpuOnly},
{Spec: cpuAndMemory}, {Spec: cpuAndMemory},
}, },
......
plugin/pkg/scheduler/algorithm/priorities/image_locality.go
View file @ f782aba5
...@@ -19,7 +19,7 @@ package priorities ...@@ -19,7 +19,7 @@ package priorities
import ( import (
"fmt" "fmt"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
...@@ -29,7 +29,7 @@ import ( ...@@ -29,7 +29,7 @@ import (
// based on the total size of those images. // based on the total size of those images.
// - If none of the images are present, this node will be given the lowest priority. // - If none of the images are present, this node will be given the lowest priority.
// - If some of the images are present on a node, the larger their sizes' sum, the higher the node's priority. // - If some of the images are present on a node, the larger their sizes' sum, the higher the node's priority.
func ImageLocalityPriorityMap(pod *api.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) { func ImageLocalityPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) {
node := nodeInfo.Node() node := nodeInfo.Node()
if node == nil { if node == nil {
return schedulerapi.HostPriority{}, fmt.Errorf("node not found") return schedulerapi.HostPriority{}, fmt.Errorf("node not found")
...@@ -66,7 +66,7 @@ func calculateScoreFromSize(sumSize int64) int { ...@@ -66,7 +66,7 @@ func calculateScoreFromSize(sumSize int64) int {
} }
// checkContainerImageOnNode checks if a container image is present on a node and returns its size. // checkContainerImageOnNode checks if a container image is present on a node and returns its size.
func checkContainerImageOnNode(node *api.Node, container *api.Container) int64 { func checkContainerImageOnNode(node *v1.Node, container *v1.Container) int64 {
for _, image := range node.Status.Images { for _, image := range node.Status.Images {
for _, name := range image.Names { for _, name := range image.Names {
if container.Image == name { if container.Image == name {
......
plugin/pkg/scheduler/algorithm/priorities/image_locality_test.go
View file @ f782aba5
...@@ -21,14 +21,14 @@ import ( ...@@ -21,14 +21,14 @@ import (
"sort" "sort"
"testing" "testing"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
func TestImageLocalityPriority(t *testing.T) { func TestImageLocalityPriority(t *testing.T) {
test_40_250 := api.PodSpec{ test_40_250 := v1.PodSpec{
Containers: []api.Container{ Containers: []v1.Container{
{ {
Image: "gcr.io/40", Image: "gcr.io/40",
}, },
...@@ -38,8 +38,8 @@ func TestImageLocalityPriority(t *testing.T) { ...@@ -38,8 +38,8 @@ func TestImageLocalityPriority(t *testing.T) {
}, },
} }
test_40_140 := api.PodSpec{ test_40_140 := v1.PodSpec{
Containers: []api.Container{ Containers: []v1.Container{
{ {
Image: "gcr.io/40", Image: "gcr.io/40",
}, },
...@@ -49,8 +49,8 @@ func TestImageLocalityPriority(t *testing.T) { ...@@ -49,8 +49,8 @@ func TestImageLocalityPriority(t *testing.T) {
}, },
} }
test_min_max := api.PodSpec{ test_min_max := v1.PodSpec{
Containers: []api.Container{ Containers: []v1.Container{
{ {
Image: "gcr.io/10", Image: "gcr.io/10",
}, },
...@@ -60,8 +60,8 @@ func TestImageLocalityPriority(t *testing.T) { ...@@ -60,8 +60,8 @@ func TestImageLocalityPriority(t *testing.T) {
}, },
} }
node_40_140_2000 := api.NodeStatus{ node_40_140_2000 := v1.NodeStatus{
Images: []api.ContainerImage{ Images: []v1.ContainerImage{
{ {
Names: []string{ Names: []string{
"gcr.io/40", "gcr.io/40",
...@@ -86,8 +86,8 @@ func TestImageLocalityPriority(t *testing.T) { ...@@ -86,8 +86,8 @@ func TestImageLocalityPriority(t *testing.T) {
}, },
} }
node_250_10 := api.NodeStatus{ node_250_10 := v1.NodeStatus{
Images: []api.ContainerImage{ Images: []v1.ContainerImage{
{ {
Names: []string{ Names: []string{
"gcr.io/250", "gcr.io/250",
...@@ -105,9 +105,9 @@ func TestImageLocalityPriority(t *testing.T) { ...@@ -105,9 +105,9 @@ func TestImageLocalityPriority(t *testing.T) {
} }
tests := []struct { tests := []struct {
pod *api.Pod pod *v1.Pod
pods []*api.Pod pods []*v1.Pod
nodes []*api.Node nodes []*v1.Node
expectedList schedulerapi.HostPriorityList expectedList schedulerapi.HostPriorityList
test string test string
}{ }{
...@@ -121,8 +121,8 @@ func TestImageLocalityPriority(t *testing.T) { ...@@ -121,8 +121,8 @@ func TestImageLocalityPriority(t *testing.T) {
// Node2 // Node2
// Image: gcr.io/250 250MB // Image: gcr.io/250 250MB
// Score: (250M-23M)/97.7M + 1 = 3 // Score: (250M-23M)/97.7M + 1 = 3
pod: &api.Pod{Spec: test_40_250}, pod: &v1.Pod{Spec: test_40_250},
nodes: []*api.Node{makeImageNode("machine1", node_40_140_2000), makeImageNode("machine2", node_250_10)}, nodes: []*v1.Node{makeImageNode("machine1", node_40_140_2000), makeImageNode("machine2", node_250_10)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 1}, {Host: "machine2", Score: 3}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 1}, {Host: "machine2", Score: 3}},
test: "two images spread on two nodes, prefer the larger image one", test: "two images spread on two nodes, prefer the larger image one",
}, },
...@@ -136,8 +136,8 @@ func TestImageLocalityPriority(t *testing.T) { ...@@ -136,8 +136,8 @@ func TestImageLocalityPriority(t *testing.T) {
// Node2 // Node2
// Image: not present // Image: not present
// Score: 0 // Score: 0
pod: &api.Pod{Spec: test_40_140}, pod: &v1.Pod{Spec: test_40_140},
nodes: []*api.Node{makeImageNode("machine1", node_40_140_2000), makeImageNode("machine2", node_250_10)}, nodes: []*v1.Node{makeImageNode("machine1", node_40_140_2000), makeImageNode("machine2", node_250_10)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 2}, {Host: "machine2", Score: 0}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 2}, {Host: "machine2", Score: 0}},
test: "two images on one node, prefer this node", test: "two images on one node, prefer this node",
}, },
...@@ -151,8 +151,8 @@ func TestImageLocalityPriority(t *testing.T) { ...@@ -151,8 +151,8 @@ func TestImageLocalityPriority(t *testing.T) {
// Node2 // Node2
// Image: gcr.io/10 10MB // Image: gcr.io/10 10MB
// Score: 10 < min score = 0 // Score: 10 < min score = 0
pod: &api.Pod{Spec: test_min_max}, pod: &v1.Pod{Spec: test_min_max},
nodes: []*api.Node{makeImageNode("machine1", node_40_140_2000), makeImageNode("machine2", node_250_10)}, nodes: []*v1.Node{makeImageNode("machine1", node_40_140_2000), makeImageNode("machine2", node_250_10)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 0}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 0}},
test: "if exceed limit, use limit", test: "if exceed limit, use limit",
}, },
...@@ -174,9 +174,9 @@ func TestImageLocalityPriority(t *testing.T) { ...@@ -174,9 +174,9 @@ func TestImageLocalityPriority(t *testing.T) {
} }
} }
func makeImageNode(node string, status api.NodeStatus) *api.Node { func makeImageNode(node string, status v1.NodeStatus) *v1.Node {
return &api.Node{ return &v1.Node{
ObjectMeta: api.ObjectMeta{Name: node}, ObjectMeta: v1.ObjectMeta{Name: node},
Status: status, Status: status,
} }
} }
plugin/pkg/scheduler/algorithm/priorities/interpod_affinity.go
View file @ f782aba5
...@@ -20,7 +20,7 @@ import ( ...@@ -20,7 +20,7 @@ import (
"sync" "sync"
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/util/workqueue" "k8s.io/kubernetes/pkg/util/workqueue"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates"
...@@ -57,7 +57,7 @@ type podAffinityPriorityMap struct { ...@@ -57,7 +57,7 @@ type podAffinityPriorityMap struct {
sync.Mutex sync.Mutex
// nodes contain all nodes that should be considered // nodes contain all nodes that should be considered
nodes []*api.Node nodes []*v1.Node
// counts store the mapping from node name to so-far computed score of // counts store the mapping from node name to so-far computed score of
// the node. // the node.
counts map[string]float64 counts map[string]float64
...@@ -67,7 +67,7 @@ type podAffinityPriorityMap struct { ...@@ -67,7 +67,7 @@ type podAffinityPriorityMap struct {
firstError error firstError error
} }
func newPodAffinityPriorityMap(nodes []*api.Node, failureDomains priorityutil.Topologies) *podAffinityPriorityMap { func newPodAffinityPriorityMap(nodes []*v1.Node, failureDomains priorityutil.Topologies) *podAffinityPriorityMap {
return &podAffinityPriorityMap{ return &podAffinityPriorityMap{
nodes: nodes, nodes: nodes,
counts: make(map[string]float64, len(nodes)), counts: make(map[string]float64, len(nodes)),
...@@ -83,7 +83,7 @@ func (p *podAffinityPriorityMap) setError(err error) { ...@@ -83,7 +83,7 @@ func (p *podAffinityPriorityMap) setError(err error) {
} }
} }
func (p *podAffinityPriorityMap) processTerm(term *api.PodAffinityTerm, podDefiningAffinityTerm, podToCheck *api.Pod, fixedNode *api.Node, weight float64) { func (p *podAffinityPriorityMap) processTerm(term *v1.PodAffinityTerm, podDefiningAffinityTerm, podToCheck *v1.Pod, fixedNode *v1.Node, weight float64) {
match, err := priorityutil.PodMatchesTermsNamespaceAndSelector(podToCheck, podDefiningAffinityTerm, term) match, err := priorityutil.PodMatchesTermsNamespaceAndSelector(podToCheck, podDefiningAffinityTerm, term)
if err != nil { if err != nil {
p.setError(err) p.setError(err)
...@@ -102,7 +102,7 @@ func (p *podAffinityPriorityMap) processTerm(term *api.PodAffinityTerm, podDefin ...@@ -102,7 +102,7 @@ func (p *podAffinityPriorityMap) processTerm(term *api.PodAffinityTerm, podDefin
} }
} }
func (p *podAffinityPriorityMap) processTerms(terms []api.WeightedPodAffinityTerm, podDefiningAffinityTerm, podToCheck *api.Pod, fixedNode *api.Node, multiplier int) { func (p *podAffinityPriorityMap) processTerms(terms []v1.WeightedPodAffinityTerm, podDefiningAffinityTerm, podToCheck *v1.Pod, fixedNode *v1.Node, multiplier int) {
for i := range terms { for i := range terms {
term := &terms[i] term := &terms[i]
p.processTerm(&term.PodAffinityTerm, podDefiningAffinityTerm, podToCheck, fixedNode, float64(term.Weight*int32(multiplier))) p.processTerm(&term.PodAffinityTerm, podDefiningAffinityTerm, podToCheck, fixedNode, float64(term.Weight*int32(multiplier)))
...@@ -114,8 +114,8 @@ func (p *podAffinityPriorityMap) processTerms(terms []api.WeightedPodAffinityTer ...@@ -114,8 +114,8 @@ func (p *podAffinityPriorityMap) processTerms(terms []api.WeightedPodAffinityTer
// that node; the node(s) with the highest sum are the most preferred. // that node; the node(s) with the highest sum are the most preferred.
// Symmetry need to be considered for preferredDuringSchedulingIgnoredDuringExecution from podAffinity & podAntiAffinity, // Symmetry need to be considered for preferredDuringSchedulingIgnoredDuringExecution from podAffinity & podAntiAffinity,
// symmetry need to be considered for hard requirements from podAffinity // symmetry need to be considered for hard requirements from podAffinity
func (ipa *InterPodAffinity) CalculateInterPodAffinityPriority(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodes []*api.Node) (schedulerapi.HostPriorityList, error) { func (ipa *InterPodAffinity) CalculateInterPodAffinityPriority(pod *v1.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodes []*v1.Node) (schedulerapi.HostPriorityList, error) {
affinity, err := api.GetAffinityFromPodAnnotations(pod.Annotations) affinity, err := v1.GetAffinityFromPodAnnotations(pod.Annotations)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -134,12 +134,12 @@ func (ipa *InterPodAffinity) CalculateInterPodAffinityPriority(pod *api.Pod, nod ...@@ -134,12 +134,12 @@ func (ipa *InterPodAffinity) CalculateInterPodAffinityPriority(pod *api.Pod, nod
// the node. // the node.
pm := newPodAffinityPriorityMap(nodes, ipa.failureDomains) pm := newPodAffinityPriorityMap(nodes, ipa.failureDomains)
processPod := func(existingPod *api.Pod) error { processPod := func(existingPod *v1.Pod) error {
existingPodNode, err := ipa.info.GetNodeInfo(existingPod.Spec.NodeName) existingPodNode, err := ipa.info.GetNodeInfo(existingPod.Spec.NodeName)
if err != nil { if err != nil {
return err return err
} }
existingPodAffinity, err := api.GetAffinityFromPodAnnotations(existingPod.Annotations) existingPodAffinity, err := v1.GetAffinityFromPodAnnotations(existingPod.Annotations)
if err != nil { if err != nil {
return err return err
} }
......
plugin/pkg/scheduler/algorithm/priorities/least_requested.go
View file @ f782aba5
...@@ -19,7 +19,7 @@ package priorities ...@@ -19,7 +19,7 @@ package priorities
import ( import (
"fmt" "fmt"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
...@@ -30,7 +30,7 @@ import ( ...@@ -30,7 +30,7 @@ import (
// It calculates the percentage of memory and CPU requested by pods scheduled on the node, and prioritizes // It calculates the percentage of memory and CPU requested by pods scheduled on the node, and prioritizes
// based on the minimum of the average of the fraction of requested to capacity. // based on the minimum of the average of the fraction of requested to capacity.
// Details: cpu((capacity - sum(requested)) * 10 / capacity) + memory((capacity - sum(requested)) * 10 / capacity) / 2 // Details: cpu((capacity - sum(requested)) * 10 / capacity) + memory((capacity - sum(requested)) * 10 / capacity) / 2
func LeastRequestedPriorityMap(pod *api.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) { func LeastRequestedPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) {
var nonZeroRequest *schedulercache.Resource var nonZeroRequest *schedulercache.Resource
if priorityMeta, ok := meta.(*priorityMetadata); ok { if priorityMeta, ok := meta.(*priorityMetadata); ok {
nonZeroRequest = priorityMeta.nonZeroRequest nonZeroRequest = priorityMeta.nonZeroRequest
...@@ -59,7 +59,7 @@ func calculateUnusedScore(requested int64, capacity int64, node string) int64 { ...@@ -59,7 +59,7 @@ func calculateUnusedScore(requested int64, capacity int64, node string) int64 {
// Calculates host priority based on the amount of unused resources. // Calculates host priority based on the amount of unused resources.
// 'node' has information about the resources on the node. // 'node' has information about the resources on the node.
// 'pods' is a list of pods currently scheduled on the node. // 'pods' is a list of pods currently scheduled on the node.
func calculateUnusedPriority(pod *api.Pod, podRequests *schedulercache.Resource, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) { func calculateUnusedPriority(pod *v1.Pod, podRequests *schedulercache.Resource, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) {
node := nodeInfo.Node() node := nodeInfo.Node()
if node == nil { if node == nil {
return schedulerapi.HostPriority{}, fmt.Errorf("node not found") return schedulerapi.HostPriority{}, fmt.Errorf("node not found")
......
plugin/pkg/scheduler/algorithm/priorities/least_requested_test.go
View file @ f782aba5
...@@ -20,8 +20,8 @@ import ( ...@@ -20,8 +20,8 @@ import (
"reflect" "reflect"
"testing" "testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
...@@ -35,29 +35,29 @@ func TestLeastRequested(t *testing.T) { ...@@ -35,29 +35,29 @@ func TestLeastRequested(t *testing.T) {
"bar": "foo", "bar": "foo",
"baz": "blah", "baz": "blah",
} }
machine1Spec := api.PodSpec{ machine1Spec := v1.PodSpec{
NodeName: "machine1", NodeName: "machine1",
} }
machine2Spec := api.PodSpec{ machine2Spec := v1.PodSpec{
NodeName: "machine2", NodeName: "machine2",
} }
noResources := api.PodSpec{ noResources := v1.PodSpec{
Containers: []api.Container{}, Containers: []v1.Container{},
} }
cpuOnly := api.PodSpec{ cpuOnly := v1.PodSpec{
NodeName: "machine1", NodeName: "machine1",
Containers: []api.Container{ Containers: []v1.Container{
{ {
Resources: api.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: api.ResourceList{ Requests: v1.ResourceList{
"cpu": resource.MustParse("1000m"), "cpu": resource.MustParse("1000m"),
"memory": resource.MustParse("0"), "memory": resource.MustParse("0"),
}, },
}, },
}, },
{ {
Resources: api.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: api.ResourceList{ Requests: v1.ResourceList{
"cpu": resource.MustParse("2000m"), "cpu": resource.MustParse("2000m"),
"memory": resource.MustParse("0"), "memory": resource.MustParse("0"),
}, },
...@@ -67,20 +67,20 @@ func TestLeastRequested(t *testing.T) { ...@@ -67,20 +67,20 @@ func TestLeastRequested(t *testing.T) {
} }
cpuOnly2 := cpuOnly cpuOnly2 := cpuOnly
cpuOnly2.NodeName = "machine2" cpuOnly2.NodeName = "machine2"
cpuAndMemory := api.PodSpec{ cpuAndMemory := v1.PodSpec{
NodeName: "machine2", NodeName: "machine2",
Containers: []api.Container{ Containers: []v1.Container{
{ {
Resources: api.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: api.ResourceList{ Requests: v1.ResourceList{
"cpu": resource.MustParse("1000m"), "cpu": resource.MustParse("1000m"),
"memory": resource.MustParse("2000"), "memory": resource.MustParse("2000"),
}, },
}, },
}, },
{ {
Resources: api.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: api.ResourceList{ Requests: v1.ResourceList{
"cpu": resource.MustParse("2000m"), "cpu": resource.MustParse("2000m"),
"memory": resource.MustParse("3000"), "memory": resource.MustParse("3000"),
}, },
...@@ -89,9 +89,9 @@ func TestLeastRequested(t *testing.T) { ...@@ -89,9 +89,9 @@ func TestLeastRequested(t *testing.T) {
}, },
} }
tests := []struct { tests := []struct {
pod *api.Pod pod *v1.Pod
pods []*api.Pod pods []*v1.Pod
nodes []*api.Node nodes []*v1.Node
expectedList schedulerapi.HostPriorityList expectedList schedulerapi.HostPriorityList
test string test string
}{ }{
...@@ -107,8 +107,8 @@ func TestLeastRequested(t *testing.T) { ...@@ -107,8 +107,8 @@ func TestLeastRequested(t *testing.T) {
Memory Score: ((10000 - 0) *10) / 10000 = 10 Memory Score: ((10000 - 0) *10) / 10000 = 10
Node2 Score: (10 + 10) / 2 = 10 Node2 Score: (10 + 10) / 2 = 10
*/ */
pod: &api.Pod{Spec: noResources}, pod: &v1.Pod{Spec: noResources},
nodes: []*api.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)}, nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 10}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 10}},
test: "nothing scheduled, nothing requested", test: "nothing scheduled, nothing requested",
}, },
...@@ -124,8 +124,8 @@ func TestLeastRequested(t *testing.T) { ...@@ -124,8 +124,8 @@ func TestLeastRequested(t *testing.T) {
Memory Score: ((10000 - 5000) *10) / 10000 = 5 Memory Score: ((10000 - 5000) *10) / 10000 = 5
Node2 Score: (5 + 5) / 2 = 5 Node2 Score: (5 + 5) / 2 = 5
*/ */
pod: &api.Pod{Spec: cpuAndMemory}, pod: &v1.Pod{Spec: cpuAndMemory},
nodes: []*api.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 6000, 10000)}, nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 6000, 10000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 3}, {Host: "machine2", Score: 5}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 3}, {Host: "machine2", Score: 5}},
test: "nothing scheduled, resources requested, differently sized machines", test: "nothing scheduled, resources requested, differently sized machines",
}, },
...@@ -141,15 +141,15 @@ func TestLeastRequested(t *testing.T) { ...@@ -141,15 +141,15 @@ func TestLeastRequested(t *testing.T) {
Memory Score: ((10000 - 0) *10) / 10000 = 10 Memory Score: ((10000 - 0) *10) / 10000 = 10
Node2 Score: (10 + 10) / 2 = 10 Node2 Score: (10 + 10) / 2 = 10
*/ */
pod: &api.Pod{Spec: noResources}, pod: &v1.Pod{Spec: noResources},
nodes: []*api.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)}, nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 10}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 10}},
test: "no resources requested, pods scheduled", test: "no resources requested, pods scheduled",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: machine1Spec, ObjectMeta: api.ObjectMeta{Labels: labels2}}, {Spec: machine1Spec, ObjectMeta: v1.ObjectMeta{Labels: labels2}},
{Spec: machine1Spec, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: machine1Spec, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
{Spec: machine2Spec, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: machine2Spec, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
{Spec: machine2Spec, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: machine2Spec, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
}, },
}, },
{ {
...@@ -164,15 +164,15 @@ func TestLeastRequested(t *testing.T) { ...@@ -164,15 +164,15 @@ func TestLeastRequested(t *testing.T) {
Memory Score: ((20000 - 5000) *10) / 20000 = 7.5 Memory Score: ((20000 - 5000) *10) / 20000 = 7.5
Node2 Score: (4 + 7.5) / 2 = 5 Node2 Score: (4 + 7.5) / 2 = 5
*/ */
pod: &api.Pod{Spec: noResources}, pod: &v1.Pod{Spec: noResources},
nodes: []*api.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)}, nodes: []*v1.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 7}, {Host: "machine2", Score: 5}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 7}, {Host: "machine2", Score: 5}},
test: "no resources requested, pods scheduled with resources", test: "no resources requested, pods scheduled with resources",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: cpuOnly, ObjectMeta: api.ObjectMeta{Labels: labels2}}, {Spec: cpuOnly, ObjectMeta: v1.ObjectMeta{Labels: labels2}},
{Spec: cpuOnly, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: cpuOnly, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
{Spec: cpuOnly2, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: cpuOnly2, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
{Spec: cpuAndMemory, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: cpuAndMemory, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
}, },
}, },
{ {
...@@ -187,11 +187,11 @@ func TestLeastRequested(t *testing.T) { ...@@ -187,11 +187,11 @@ func TestLeastRequested(t *testing.T) {
Memory Score: ((20000 - 10000) *10) / 20000 = 5 Memory Score: ((20000 - 10000) *10) / 20000 = 5
Node2 Score: (4 + 5) / 2 = 4 Node2 Score: (4 + 5) / 2 = 4
*/ */
pod: &api.Pod{Spec: cpuAndMemory}, pod: &v1.Pod{Spec: cpuAndMemory},
nodes: []*api.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)}, nodes: []*v1.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 5}, {Host: "machine2", Score: 4}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 5}, {Host: "machine2", Score: 4}},
test: "resources requested, pods scheduled with resources", test: "resources requested, pods scheduled with resources",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: cpuOnly}, {Spec: cpuOnly},
{Spec: cpuAndMemory}, {Spec: cpuAndMemory},
}, },
...@@ -208,11 +208,11 @@ func TestLeastRequested(t *testing.T) { ...@@ -208,11 +208,11 @@ func TestLeastRequested(t *testing.T) {
Memory Score: ((50000 - 10000) *10) / 50000 = 8 Memory Score: ((50000 - 10000) *10) / 50000 = 8
Node2 Score: (4 + 8) / 2 = 6 Node2 Score: (4 + 8) / 2 = 6
*/ */
pod: &api.Pod{Spec: cpuAndMemory}, pod: &v1.Pod{Spec: cpuAndMemory},
nodes: []*api.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 50000)}, nodes: []*v1.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 50000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 5}, {Host: "machine2", Score: 6}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 5}, {Host: "machine2", Score: 6}},
test: "resources requested, pods scheduled with resources, differently sized machines", test: "resources requested, pods scheduled with resources, differently sized machines",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: cpuOnly}, {Spec: cpuOnly},
{Spec: cpuAndMemory}, {Spec: cpuAndMemory},
}, },
...@@ -229,21 +229,21 @@ func TestLeastRequested(t *testing.T) { ...@@ -229,21 +229,21 @@ func TestLeastRequested(t *testing.T) {
Memory Score: ((10000 - 5000) *10) / 10000 = 5 Memory Score: ((10000 - 5000) *10) / 10000 = 5
Node2 Score: (0 + 5) / 2 = 2 Node2 Score: (0 + 5) / 2 = 2
*/ */
pod: &api.Pod{Spec: cpuOnly}, pod: &v1.Pod{Spec: cpuOnly},
nodes: []*api.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)}, nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 5}, {Host: "machine2", Score: 2}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 5}, {Host: "machine2", Score: 2}},
test: "requested resources exceed node capacity", test: "requested resources exceed node capacity",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: cpuOnly}, {Spec: cpuOnly},
{Spec: cpuAndMemory}, {Spec: cpuAndMemory},
}, },
}, },
{ {
pod: &api.Pod{Spec: noResources}, pod: &v1.Pod{Spec: noResources},
nodes: []*api.Node{makeNode("machine1", 0, 0), makeNode("machine2", 0, 0)}, nodes: []*v1.Node{makeNode("machine1", 0, 0), makeNode("machine2", 0, 0)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}},
test: "zero node resources, pods scheduled with resources", test: "zero node resources, pods scheduled with resources",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: cpuOnly}, {Spec: cpuOnly},
{Spec: cpuAndMemory}, {Spec: cpuAndMemory},
}, },
......
plugin/pkg/scheduler/algorithm/priorities/metadata.go
View file @ f782aba5
...@@ -17,19 +17,19 @@ limitations under the License. ...@@ -17,19 +17,19 @@ limitations under the License.
package priorities package priorities
import ( import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
// priorityMetadata is a type that is passed as metadata for priority functions // priorityMetadata is a type that is passed as metadata for priority functions
type priorityMetadata struct { type priorityMetadata struct {
nonZeroRequest *schedulercache.Resource nonZeroRequest *schedulercache.Resource
podTolerations []api.Toleration podTolerations []v1.Toleration
affinity *api.Affinity affinity *v1.Affinity
} }
// PriorityMetadata is a MetadataProducer. Node info can be nil. // PriorityMetadata is a MetadataProducer. Node info can be nil.
func PriorityMetadata(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo) interface{} { func PriorityMetadata(pod *v1.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo) interface{} {
// If we cannot compute metadata, just return nil // If we cannot compute metadata, just return nil
if pod == nil { if pod == nil {
return nil return nil
...@@ -38,7 +38,7 @@ func PriorityMetadata(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.No ...@@ -38,7 +38,7 @@ func PriorityMetadata(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.No
if err != nil { if err != nil {
return nil return nil
} }
affinity, err := api.GetAffinityFromPodAnnotations(pod.Annotations) affinity, err := v1.GetAffinityFromPodAnnotations(pod.Annotations)
if err != nil { if err != nil {
return nil return nil
} }
......
plugin/pkg/scheduler/algorithm/priorities/most_requested.go
View file @ f782aba5
...@@ -19,7 +19,7 @@ package priorities ...@@ -19,7 +19,7 @@ package priorities
import ( import (
"fmt" "fmt"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
...@@ -30,7 +30,7 @@ import ( ...@@ -30,7 +30,7 @@ import (
// It calculates the percentage of memory and CPU requested by pods scheduled on the node, and prioritizes // It calculates the percentage of memory and CPU requested by pods scheduled on the node, and prioritizes
// based on the maximum of the average of the fraction of requested to capacity. // based on the maximum of the average of the fraction of requested to capacity.
// Details: (cpu(10 * sum(requested) / capacity) + memory(10 * sum(requested) / capacity)) / 2 // Details: (cpu(10 * sum(requested) / capacity) + memory(10 * sum(requested) / capacity)) / 2
func MostRequestedPriorityMap(pod *api.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) { func MostRequestedPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) {
var nonZeroRequest *schedulercache.Resource var nonZeroRequest *schedulercache.Resource
if priorityMeta, ok := meta.(*priorityMetadata); ok { if priorityMeta, ok := meta.(*priorityMetadata); ok {
nonZeroRequest = priorityMeta.nonZeroRequest nonZeroRequest = priorityMeta.nonZeroRequest
...@@ -62,7 +62,7 @@ func calculateUsedScore(requested int64, capacity int64, node string) int64 { ...@@ -62,7 +62,7 @@ func calculateUsedScore(requested int64, capacity int64, node string) int64 {
// Calculate the resource used on a node. 'node' has information about the resources on the node. // Calculate the resource used on a node. 'node' has information about the resources on the node.
// 'pods' is a list of pods currently scheduled on the node. // 'pods' is a list of pods currently scheduled on the node.
func calculateUsedPriority(pod *api.Pod, podRequests *schedulercache.Resource, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) { func calculateUsedPriority(pod *v1.Pod, podRequests *schedulercache.Resource, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) {
node := nodeInfo.Node() node := nodeInfo.Node()
if node == nil { if node == nil {
return schedulerapi.HostPriority{}, fmt.Errorf("node not found") return schedulerapi.HostPriority{}, fmt.Errorf("node not found")
......
plugin/pkg/scheduler/algorithm/priorities/most_requested_test.go
View file @ f782aba5
...@@ -20,8 +20,8 @@ import ( ...@@ -20,8 +20,8 @@ import (
"reflect" "reflect"
"testing" "testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
...@@ -35,23 +35,23 @@ func TestMostRequested(t *testing.T) { ...@@ -35,23 +35,23 @@ func TestMostRequested(t *testing.T) {
"bar": "foo", "bar": "foo",
"baz": "blah", "baz": "blah",
} }
noResources := api.PodSpec{ noResources := v1.PodSpec{
Containers: []api.Container{}, Containers: []v1.Container{},
} }
cpuOnly := api.PodSpec{ cpuOnly := v1.PodSpec{
NodeName: "machine1", NodeName: "machine1",
Containers: []api.Container{ Containers: []v1.Container{
{ {
Resources: api.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: api.ResourceList{ Requests: v1.ResourceList{
"cpu": resource.MustParse("1000m"), "cpu": resource.MustParse("1000m"),
"memory": resource.MustParse("0"), "memory": resource.MustParse("0"),
}, },
}, },
}, },
{ {
Resources: api.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: api.ResourceList{ Requests: v1.ResourceList{
"cpu": resource.MustParse("2000m"), "cpu": resource.MustParse("2000m"),
"memory": resource.MustParse("0"), "memory": resource.MustParse("0"),
}, },
...@@ -61,20 +61,20 @@ func TestMostRequested(t *testing.T) { ...@@ -61,20 +61,20 @@ func TestMostRequested(t *testing.T) {
} }
cpuOnly2 := cpuOnly cpuOnly2 := cpuOnly
cpuOnly2.NodeName = "machine2" cpuOnly2.NodeName = "machine2"
cpuAndMemory := api.PodSpec{ cpuAndMemory := v1.PodSpec{
NodeName: "machine2", NodeName: "machine2",
Containers: []api.Container{ Containers: []v1.Container{
{ {
Resources: api.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: api.ResourceList{ Requests: v1.ResourceList{
"cpu": resource.MustParse("1000m"), "cpu": resource.MustParse("1000m"),
"memory": resource.MustParse("2000"), "memory": resource.MustParse("2000"),
}, },
}, },
}, },
{ {
Resources: api.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: api.ResourceList{ Requests: v1.ResourceList{
"cpu": resource.MustParse("2000m"), "cpu": resource.MustParse("2000m"),
"memory": resource.MustParse("3000"), "memory": resource.MustParse("3000"),
}, },
...@@ -83,9 +83,9 @@ func TestMostRequested(t *testing.T) { ...@@ -83,9 +83,9 @@ func TestMostRequested(t *testing.T) {
}, },
} }
tests := []struct { tests := []struct {
pod *api.Pod pod *v1.Pod
pods []*api.Pod pods []*v1.Pod
nodes []*api.Node nodes []*v1.Node
expectedList schedulerapi.HostPriorityList expectedList schedulerapi.HostPriorityList
test string test string
}{ }{
...@@ -101,8 +101,8 @@ func TestMostRequested(t *testing.T) { ...@@ -101,8 +101,8 @@ func TestMostRequested(t *testing.T) {
Memory Score: (0 * 10 / 10000 = 0 Memory Score: (0 * 10 / 10000 = 0
Node2 Score: (0 + 0) / 2 = 0 Node2 Score: (0 + 0) / 2 = 0
*/ */
pod: &api.Pod{Spec: noResources}, pod: &v1.Pod{Spec: noResources},
nodes: []*api.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)}, nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 4000, 10000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}},
test: "nothing scheduled, nothing requested", test: "nothing scheduled, nothing requested",
}, },
...@@ -118,8 +118,8 @@ func TestMostRequested(t *testing.T) { ...@@ -118,8 +118,8 @@ func TestMostRequested(t *testing.T) {
Memory Score: (5000 * 10 / 10000 = 5 Memory Score: (5000 * 10 / 10000 = 5
Node2 Score: (5 + 5) / 2 = 5 Node2 Score: (5 + 5) / 2 = 5
*/ */
pod: &api.Pod{Spec: cpuAndMemory}, pod: &v1.Pod{Spec: cpuAndMemory},
nodes: []*api.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 6000, 10000)}, nodes: []*v1.Node{makeNode("machine1", 4000, 10000), makeNode("machine2", 6000, 10000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 6}, {Host: "machine2", Score: 5}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 6}, {Host: "machine2", Score: 5}},
test: "nothing scheduled, resources requested, differently sized machines", test: "nothing scheduled, resources requested, differently sized machines",
}, },
...@@ -135,15 +135,15 @@ func TestMostRequested(t *testing.T) { ...@@ -135,15 +135,15 @@ func TestMostRequested(t *testing.T) {
Memory Score: (5000 * 10) / 20000 = 2.5 Memory Score: (5000 * 10) / 20000 = 2.5
Node2 Score: (6 + 2.5) / 2 = 4 Node2 Score: (6 + 2.5) / 2 = 4
*/ */
pod: &api.Pod{Spec: noResources}, pod: &v1.Pod{Spec: noResources},
nodes: []*api.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)}, nodes: []*v1.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 3}, {Host: "machine2", Score: 4}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 3}, {Host: "machine2", Score: 4}},
test: "no resources requested, pods scheduled with resources", test: "no resources requested, pods scheduled with resources",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: cpuOnly, ObjectMeta: api.ObjectMeta{Labels: labels2}}, {Spec: cpuOnly, ObjectMeta: v1.ObjectMeta{Labels: labels2}},
{Spec: cpuOnly, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: cpuOnly, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
{Spec: cpuOnly2, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: cpuOnly2, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
{Spec: cpuAndMemory, ObjectMeta: api.ObjectMeta{Labels: labels1}}, {Spec: cpuAndMemory, ObjectMeta: v1.ObjectMeta{Labels: labels1}},
}, },
}, },
{ {
...@@ -158,11 +158,11 @@ func TestMostRequested(t *testing.T) { ...@@ -158,11 +158,11 @@ func TestMostRequested(t *testing.T) {
Memory Score: (10000 * 10) / 20000 = 5 Memory Score: (10000 * 10) / 20000 = 5
Node2 Score: (6 + 5) / 2 = 5 Node2 Score: (6 + 5) / 2 = 5
*/ */
pod: &api.Pod{Spec: cpuAndMemory}, pod: &v1.Pod{Spec: cpuAndMemory},
nodes: []*api.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)}, nodes: []*v1.Node{makeNode("machine1", 10000, 20000), makeNode("machine2", 10000, 20000)},
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 4}, {Host: "machine2", Score: 5}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 4}, {Host: "machine2", Score: 5}},
test: "resources requested, pods scheduled with resources", test: "resources requested, pods scheduled with resources",
pods: []*api.Pod{ pods: []*v1.Pod{
{Spec: cpuOnly}, {Spec: cpuOnly},
{Spec: cpuAndMemory}, {Spec: cpuAndMemory},
}, },
......
plugin/pkg/scheduler/algorithm/priorities/node_affinity.go
View file @ f782aba5
...@@ -20,7 +20,7 @@ import ( ...@@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
...@@ -31,19 +31,19 @@ import ( ...@@ -31,19 +31,19 @@ import (
// it will a get an add of preferredSchedulingTerm.Weight. Thus, the more preferredSchedulingTerms // it will a get an add of preferredSchedulingTerm.Weight. Thus, the more preferredSchedulingTerms
// the node satisfies and the more the preferredSchedulingTerm that is satisfied weights, the higher // the node satisfies and the more the preferredSchedulingTerm that is satisfied weights, the higher
// score the node gets. // score the node gets.
func CalculateNodeAffinityPriorityMap(pod *api.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) { func CalculateNodeAffinityPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) {
node := nodeInfo.Node() node := nodeInfo.Node()
if node == nil { if node == nil {
return schedulerapi.HostPriority{}, fmt.Errorf("node not found") return schedulerapi.HostPriority{}, fmt.Errorf("node not found")
} }
var affinity *api.Affinity var affinity *v1.Affinity
if priorityMeta, ok := meta.(*priorityMetadata); ok { if priorityMeta, ok := meta.(*priorityMetadata); ok {
affinity = priorityMeta.affinity affinity = priorityMeta.affinity
} else { } else {
// We couldn't parse metadata - fallback to computing it. // We couldn't parse metadata - fallback to computing it.
var err error var err error
affinity, err = api.GetAffinityFromPodAnnotations(pod.Annotations) affinity, err = v1.GetAffinityFromPodAnnotations(pod.Annotations)
if err != nil { if err != nil {
return schedulerapi.HostPriority{}, err return schedulerapi.HostPriority{}, err
} }
...@@ -62,7 +62,7 @@ func CalculateNodeAffinityPriorityMap(pod *api.Pod, meta interface{}, nodeInfo * ...@@ -62,7 +62,7 @@ func CalculateNodeAffinityPriorityMap(pod *api.Pod, meta interface{}, nodeInfo *
} }
// TODO: Avoid computing it for all nodes if this becomes a performance problem. // TODO: Avoid computing it for all nodes if this becomes a performance problem.
nodeSelector, err := api.NodeSelectorRequirementsAsSelector(preferredSchedulingTerm.Preference.MatchExpressions) nodeSelector, err := v1.NodeSelectorRequirementsAsSelector(preferredSchedulingTerm.Preference.MatchExpressions)
if err != nil { if err != nil {
return schedulerapi.HostPriority{}, err return schedulerapi.HostPriority{}, err
} }
...@@ -78,7 +78,7 @@ func CalculateNodeAffinityPriorityMap(pod *api.Pod, meta interface{}, nodeInfo * ...@@ -78,7 +78,7 @@ func CalculateNodeAffinityPriorityMap(pod *api.Pod, meta interface{}, nodeInfo *
}, nil }, nil
} }
func CalculateNodeAffinityPriorityReduce(pod *api.Pod, meta interface{}, nodeNameToInfo map[string]*schedulercache.NodeInfo, result schedulerapi.HostPriorityList) error { func CalculateNodeAffinityPriorityReduce(pod *v1.Pod, meta interface{}, nodeNameToInfo map[string]*schedulercache.NodeInfo, result schedulerapi.HostPriorityList) error {
var maxCount int var maxCount int
for i := range result { for i := range result {
if result[i].Score > maxCount { if result[i].Score > maxCount {
......
plugin/pkg/scheduler/algorithm/priorities/node_affinity_test.go
View file @ f782aba5
...@@ -20,7 +20,7 @@ import ( ...@@ -20,7 +20,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
...@@ -33,7 +33,7 @@ func TestNodeAffinityPriority(t *testing.T) { ...@@ -33,7 +33,7 @@ func TestNodeAffinityPriority(t *testing.T) {
label5 := map[string]string{"foo": "bar", "key": "value", "az": "az1"} label5 := map[string]string{"foo": "bar", "key": "value", "az": "az1"}
affinity1 := map[string]string{ affinity1 := map[string]string{
api.AffinityAnnotationKey: ` v1.AffinityAnnotationKey: `
{"nodeAffinity": {"preferredDuringSchedulingIgnoredDuringExecution": [ {"nodeAffinity": {"preferredDuringSchedulingIgnoredDuringExecution": [
{ {
"weight": 2, "weight": 2,
...@@ -50,7 +50,7 @@ func TestNodeAffinityPriority(t *testing.T) { ...@@ -50,7 +50,7 @@ func TestNodeAffinityPriority(t *testing.T) {
} }
affinity2 := map[string]string{ affinity2 := map[string]string{
api.AffinityAnnotationKey: ` v1.AffinityAnnotationKey: `
{"nodeAffinity": {"preferredDuringSchedulingIgnoredDuringExecution": [ {"nodeAffinity": {"preferredDuringSchedulingIgnoredDuringExecution": [
{ {
"weight": 2, "weight": 2,
...@@ -91,63 +91,63 @@ func TestNodeAffinityPriority(t *testing.T) { ...@@ -91,63 +91,63 @@ func TestNodeAffinityPriority(t *testing.T) {
} }
tests := []struct { tests := []struct {
pod *api.Pod pod *v1.Pod
nodes []*api.Node nodes []*v1.Node
expectedList schedulerapi.HostPriorityList expectedList schedulerapi.HostPriorityList
test string test string
}{ }{
{ {
pod: &api.Pod{ pod: &v1.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Annotations: map[string]string{}, Annotations: map[string]string{},
}, },
}, },
nodes: []*api.Node{ nodes: []*v1.Node{
{ObjectMeta: api.ObjectMeta{Name: "machine1", Labels: label1}}, {ObjectMeta: v1.ObjectMeta{Name: "machine1", Labels: label1}},
{ObjectMeta: api.ObjectMeta{Name: "machine2", Labels: label2}}, {ObjectMeta: v1.ObjectMeta{Name: "machine2", Labels: label2}},
{ObjectMeta: api.ObjectMeta{Name: "machine3", Labels: label3}}, {ObjectMeta: v1.ObjectMeta{Name: "machine3", Labels: label3}},
}, },
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}, {Host: "machine3", Score: 0}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}, {Host: "machine3", Score: 0}},
test: "all machines are same priority as NodeAffinity is nil", test: "all machines are same priority as NodeAffinity is nil",
}, },
{ {
pod: &api.Pod{ pod: &v1.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Annotations: affinity1, Annotations: affinity1,
}, },
}, },
nodes: []*api.Node{ nodes: []*v1.Node{
{ObjectMeta: api.ObjectMeta{Name: "machine1", Labels: label4}}, {ObjectMeta: v1.ObjectMeta{Name: "machine1", Labels: label4}},
{ObjectMeta: api.ObjectMeta{Name: "machine2", Labels: label2}}, {ObjectMeta: v1.ObjectMeta{Name: "machine2", Labels: label2}},
{ObjectMeta: api.ObjectMeta{Name: "machine3", Labels: label3}}, {ObjectMeta: v1.ObjectMeta{Name: "machine3", Labels: label3}},
}, },
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}, {Host: "machine3", Score: 0}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}, {Host: "machine3", Score: 0}},
test: "no machine macthes preferred scheduling requirements in NodeAffinity of pod so all machines' priority is zero", test: "no machine macthes preferred scheduling requirements in NodeAffinity of pod so all machines' priority is zero",
}, },
{ {
pod: &api.Pod{ pod: &v1.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Annotations: affinity1, Annotations: affinity1,
}, },
}, },
nodes: []*api.Node{ nodes: []*v1.Node{
{ObjectMeta: api.ObjectMeta{Name: "machine1", Labels: label1}}, {ObjectMeta: v1.ObjectMeta{Name: "machine1", Labels: label1}},
{ObjectMeta: api.ObjectMeta{Name: "machine2", Labels: label2}}, {ObjectMeta: v1.ObjectMeta{Name: "machine2", Labels: label2}},
{ObjectMeta: api.ObjectMeta{Name: "machine3", Labels: label3}}, {ObjectMeta: v1.ObjectMeta{Name: "machine3", Labels: label3}},
}, },
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 0}, {Host: "machine3", Score: 0}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 0}, {Host: "machine3", Score: 0}},
test: "only machine1 matches the preferred scheduling requirements of pod", test: "only machine1 matches the preferred scheduling requirements of pod",
}, },
{ {
pod: &api.Pod{ pod: &v1.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Annotations: affinity2, Annotations: affinity2,
}, },
}, },
nodes: []*api.Node{ nodes: []*v1.Node{
{ObjectMeta: api.ObjectMeta{Name: "machine1", Labels: label1}}, {ObjectMeta: v1.ObjectMeta{Name: "machine1", Labels: label1}},
{ObjectMeta: api.ObjectMeta{Name: "machine5", Labels: label5}}, {ObjectMeta: v1.ObjectMeta{Name: "machine5", Labels: label5}},
{ObjectMeta: api.ObjectMeta{Name: "machine2", Labels: label2}}, {ObjectMeta: v1.ObjectMeta{Name: "machine2", Labels: label2}},
}, },
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 1}, {Host: "machine5", Score: 10}, {Host: "machine2", Score: 3}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 1}, {Host: "machine5", Score: 10}, {Host: "machine2", Score: 3}},
test: "all machines matches the preferred scheduling requirements of pod but with different priorities ", test: "all machines matches the preferred scheduling requirements of pod but with different priorities ",
......
plugin/pkg/scheduler/algorithm/priorities/node_label.go
View file @ f782aba5
...@@ -19,7 +19,7 @@ package priorities ...@@ -19,7 +19,7 @@ package priorities
import ( import (
"fmt" "fmt"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
...@@ -42,7 +42,7 @@ func NewNodeLabelPriority(label string, presence bool) (algorithm.PriorityMapFun ...@@ -42,7 +42,7 @@ func NewNodeLabelPriority(label string, presence bool) (algorithm.PriorityMapFun
// CalculateNodeLabelPriority checks whether a particular label exists on a node or not, regardless of its value. // CalculateNodeLabelPriority checks whether a particular label exists on a node or not, regardless of its value.
// If presence is true, prioritizes nodes that have the specified label, regardless of value. // If presence is true, prioritizes nodes that have the specified label, regardless of value.
// If presence is false, prioritizes nodes that do not have the specified label. // If presence is false, prioritizes nodes that do not have the specified label.
func (n *NodeLabelPrioritizer) CalculateNodeLabelPriorityMap(pod *api.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) { func (n *NodeLabelPrioritizer) CalculateNodeLabelPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) {
node := nodeInfo.Node() node := nodeInfo.Node()
if node == nil { if node == nil {
return schedulerapi.HostPriority{}, fmt.Errorf("node not found") return schedulerapi.HostPriority{}, fmt.Errorf("node not found")
......
plugin/pkg/scheduler/algorithm/priorities/node_label_test.go
View file @ f782aba5
...@@ -21,7 +21,7 @@ import ( ...@@ -21,7 +21,7 @@ import (
"sort" "sort"
"testing" "testing"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
...@@ -31,17 +31,17 @@ func TestNewNodeLabelPriority(t *testing.T) { ...@@ -31,17 +31,17 @@ func TestNewNodeLabelPriority(t *testing.T) {
label2 := map[string]string{"bar": "foo"} label2 := map[string]string{"bar": "foo"}
label3 := map[string]string{"bar": "baz"} label3 := map[string]string{"bar": "baz"}
tests := []struct { tests := []struct {
nodes []*api.Node nodes []*v1.Node
label string label string
presence bool presence bool
expectedList schedulerapi.HostPriorityList expectedList schedulerapi.HostPriorityList
test string test string
}{ }{
{ {
nodes: []*api.Node{ nodes: []*v1.Node{
{ObjectMeta: api.ObjectMeta{Name: "machine1", Labels: label1}}, {ObjectMeta: v1.ObjectMeta{Name: "machine1", Labels: label1}},
{ObjectMeta: api.ObjectMeta{Name: "machine2", Labels: label2}}, {ObjectMeta: v1.ObjectMeta{Name: "machine2", Labels: label2}},
{ObjectMeta: api.ObjectMeta{Name: "machine3", Labels: label3}}, {ObjectMeta: v1.ObjectMeta{Name: "machine3", Labels: label3}},
}, },
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}, {Host: "machine3", Score: 0}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}, {Host: "machine3", Score: 0}},
label: "baz", label: "baz",
...@@ -49,10 +49,10 @@ func TestNewNodeLabelPriority(t *testing.T) { ...@@ -49,10 +49,10 @@ func TestNewNodeLabelPriority(t *testing.T) {
test: "no match found, presence true", test: "no match found, presence true",
}, },
{ {
nodes: []*api.Node{ nodes: []*v1.Node{
{ObjectMeta: api.ObjectMeta{Name: "machine1", Labels: label1}}, {ObjectMeta: v1.ObjectMeta{Name: "machine1", Labels: label1}},
{ObjectMeta: api.ObjectMeta{Name: "machine2", Labels: label2}}, {ObjectMeta: v1.ObjectMeta{Name: "machine2", Labels: label2}},
{ObjectMeta: api.ObjectMeta{Name: "machine3", Labels: label3}}, {ObjectMeta: v1.ObjectMeta{Name: "machine3", Labels: label3}},
}, },
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 10}, {Host: "machine3", Score: 10}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 10}, {Host: "machine3", Score: 10}},
label: "baz", label: "baz",
...@@ -60,10 +60,10 @@ func TestNewNodeLabelPriority(t *testing.T) { ...@@ -60,10 +60,10 @@ func TestNewNodeLabelPriority(t *testing.T) {
test: "no match found, presence false", test: "no match found, presence false",
}, },
{ {
nodes: []*api.Node{ nodes: []*v1.Node{
{ObjectMeta: api.ObjectMeta{Name: "machine1", Labels: label1}}, {ObjectMeta: v1.ObjectMeta{Name: "machine1", Labels: label1}},
{ObjectMeta: api.ObjectMeta{Name: "machine2", Labels: label2}}, {ObjectMeta: v1.ObjectMeta{Name: "machine2", Labels: label2}},
{ObjectMeta: api.ObjectMeta{Name: "machine3", Labels: label3}}, {ObjectMeta: v1.ObjectMeta{Name: "machine3", Labels: label3}},
}, },
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 0}, {Host: "machine3", Score: 0}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 0}, {Host: "machine3", Score: 0}},
label: "foo", label: "foo",
...@@ -71,10 +71,10 @@ func TestNewNodeLabelPriority(t *testing.T) { ...@@ -71,10 +71,10 @@ func TestNewNodeLabelPriority(t *testing.T) {
test: "one match found, presence true", test: "one match found, presence true",
}, },
{ {
nodes: []*api.Node{ nodes: []*v1.Node{
{ObjectMeta: api.ObjectMeta{Name: "machine1", Labels: label1}}, {ObjectMeta: v1.ObjectMeta{Name: "machine1", Labels: label1}},
{ObjectMeta: api.ObjectMeta{Name: "machine2", Labels: label2}}, {ObjectMeta: v1.ObjectMeta{Name: "machine2", Labels: label2}},
{ObjectMeta: api.ObjectMeta{Name: "machine3", Labels: label3}}, {ObjectMeta: v1.ObjectMeta{Name: "machine3", Labels: label3}},
}, },
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 10}, {Host: "machine3", Score: 10}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 10}, {Host: "machine3", Score: 10}},
label: "foo", label: "foo",
...@@ -82,10 +82,10 @@ func TestNewNodeLabelPriority(t *testing.T) { ...@@ -82,10 +82,10 @@ func TestNewNodeLabelPriority(t *testing.T) {
test: "one match found, presence false", test: "one match found, presence false",
}, },
{ {
nodes: []*api.Node{ nodes: []*v1.Node{
{ObjectMeta: api.ObjectMeta{Name: "machine1", Labels: label1}}, {ObjectMeta: v1.ObjectMeta{Name: "machine1", Labels: label1}},
{ObjectMeta: api.ObjectMeta{Name: "machine2", Labels: label2}}, {ObjectMeta: v1.ObjectMeta{Name: "machine2", Labels: label2}},
{ObjectMeta: api.ObjectMeta{Name: "machine3", Labels: label3}}, {ObjectMeta: v1.ObjectMeta{Name: "machine3", Labels: label3}},
}, },
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 10}, {Host: "machine3", Score: 10}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 10}, {Host: "machine3", Score: 10}},
label: "bar", label: "bar",
...@@ -93,10 +93,10 @@ func TestNewNodeLabelPriority(t *testing.T) { ...@@ -93,10 +93,10 @@ func TestNewNodeLabelPriority(t *testing.T) {
test: "two matches found, presence true", test: "two matches found, presence true",
}, },
{ {
nodes: []*api.Node{ nodes: []*v1.Node{
{ObjectMeta: api.ObjectMeta{Name: "machine1", Labels: label1}}, {ObjectMeta: v1.ObjectMeta{Name: "machine1", Labels: label1}},
{ObjectMeta: api.ObjectMeta{Name: "machine2", Labels: label2}}, {ObjectMeta: v1.ObjectMeta{Name: "machine2", Labels: label2}},
{ObjectMeta: api.ObjectMeta{Name: "machine3", Labels: label3}}, {ObjectMeta: v1.ObjectMeta{Name: "machine3", Labels: label3}},
}, },
expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 0}, {Host: "machine3", Score: 0}}, expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 10}, {Host: "machine2", Score: 0}, {Host: "machine3", Score: 0}},
label: "bar", label: "bar",
......
plugin/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods.go
View file @ f782aba5
...@@ -19,13 +19,13 @@ package priorities ...@@ -19,13 +19,13 @@ package priorities
import ( import (
"fmt" "fmt"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
func CalculateNodePreferAvoidPodsPriorityMap(pod *api.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) { func CalculateNodePreferAvoidPodsPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) {
node := nodeInfo.Node() node := nodeInfo.Node()
if node == nil { if node == nil {
return schedulerapi.HostPriority{}, fmt.Errorf("node not found") return schedulerapi.HostPriority{}, fmt.Errorf("node not found")
...@@ -43,7 +43,7 @@ func CalculateNodePreferAvoidPodsPriorityMap(pod *api.Pod, meta interface{}, nod ...@@ -43,7 +43,7 @@ func CalculateNodePreferAvoidPodsPriorityMap(pod *api.Pod, meta interface{}, nod
return schedulerapi.HostPriority{Host: node.Name, Score: 10}, nil return schedulerapi.HostPriority{Host: node.Name, Score: 10}, nil
} }
avoids, err := api.GetAvoidPodsFromNodeAnnotations(node.Annotations) avoids, err := v1.GetAvoidPodsFromNodeAnnotations(node.Annotations)
if err != nil { if err != nil {
// If we cannot get annotation, assume it's schedulable there. // If we cannot get annotation, assume it's schedulable there.
return schedulerapi.HostPriority{Host: node.Name, Score: 10}, nil return schedulerapi.HostPriority{Host: node.Name, Score: 10}, nil
......
plugin/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods_test.go
View file @ f782aba5
...@@ -21,14 +21,14 @@ import ( ...@@ -21,14 +21,14 @@ import (
"sort" "sort"
"testing" "testing"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
func TestNodePreferAvoidPriority(t *testing.T) { func TestNodePreferAvoidPriority(t *testing.T) {
annotations1 := map[string]string{ annotations1 := map[string]string{
api.PreferAvoidPodsAnnotationKey: ` v1.PreferAvoidPodsAnnotationKey: `
{ {
"preferAvoidPods": [ "preferAvoidPods": [
{ {
...@@ -48,7 +48,7 @@ func TestNodePreferAvoidPriority(t *testing.T) { ...@@ -48,7 +48,7 @@ func TestNodePreferAvoidPriority(t *testing.T) {
}`, }`,
} }
annotations2 := map[string]string{ annotations2 := map[string]string{
api.PreferAvoidPodsAnnotationKey: ` v1.PreferAvoidPodsAnnotationKey: `
{ {
"preferAvoidPods": [ "preferAvoidPods": [
{ {
...@@ -67,29 +67,29 @@ func TestNodePreferAvoidPriority(t *testing.T) { ...@@ -67,29 +67,29 @@ func TestNodePreferAvoidPriority(t *testing.T) {
] ]
}`, }`,
} }
testNodes := []*api.Node{ testNodes := []*v1.Node{
{ {
ObjectMeta: api.ObjectMeta{Name: "machine1", Annotations: annotations1}, ObjectMeta: v1.ObjectMeta{Name: "machine1", Annotations: annotations1},
}, },
{ {
ObjectMeta: api.ObjectMeta{Name: "machine2", Annotations: annotations2}, ObjectMeta: v1.ObjectMeta{Name: "machine2", Annotations: annotations2},
}, },
{ {
ObjectMeta: api.ObjectMeta{Name: "machine3"}, ObjectMeta: v1.ObjectMeta{Name: "machine3"},
}, },
} }
trueVar := true trueVar := true
tests := []struct { tests := []struct {
pod *api.Pod pod *v1.Pod
nodes []*api.Node nodes []*v1.Node
expectedList schedulerapi.HostPriorityList expectedList schedulerapi.HostPriorityList
test string test string
}{ }{
{ {
pod: &api.Pod{ pod: &v1.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Namespace: "default", Namespace: "default",
OwnerReferences: []api.OwnerReference{ OwnerReferences: []v1.OwnerReference{
{Kind: "ReplicationController", Name: "foo", UID: "abcdef123456", Controller: &trueVar}, {Kind: "ReplicationController", Name: "foo", UID: "abcdef123456", Controller: &trueVar},
}, },
}, },
...@@ -99,10 +99,10 @@ func TestNodePreferAvoidPriority(t *testing.T) { ...@@ -99,10 +99,10 @@ func TestNodePreferAvoidPriority(t *testing.T) {
test: "pod managed by ReplicationController should avoid a node, this node get lowest priority score", test: "pod managed by ReplicationController should avoid a node, this node get lowest priority score",
}, },
{ {
pod: &api.Pod{ pod: &v1.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Namespace: "default", Namespace: "default",
OwnerReferences: []api.OwnerReference{ OwnerReferences: []v1.OwnerReference{
{Kind: "RandomController", Name: "foo", UID: "abcdef123456", Controller: &trueVar}, {Kind: "RandomController", Name: "foo", UID: "abcdef123456", Controller: &trueVar},
}, },
}, },
...@@ -112,10 +112,10 @@ func TestNodePreferAvoidPriority(t *testing.T) { ...@@ -112,10 +112,10 @@ func TestNodePreferAvoidPriority(t *testing.T) {
test: "ownership by random controller should be ignored", test: "ownership by random controller should be ignored",
}, },
{ {
pod: &api.Pod{ pod: &v1.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Namespace: "default", Namespace: "default",
OwnerReferences: []api.OwnerReference{ OwnerReferences: []v1.OwnerReference{
{Kind: "ReplicationController", Name: "foo", UID: "abcdef123456"}, {Kind: "ReplicationController", Name: "foo", UID: "abcdef123456"},
}, },
}, },
...@@ -125,10 +125,10 @@ func TestNodePreferAvoidPriority(t *testing.T) { ...@@ -125,10 +125,10 @@ func TestNodePreferAvoidPriority(t *testing.T) {
test: "owner without Controller field set should be ignored", test: "owner without Controller field set should be ignored",
}, },
{ {
pod: &api.Pod{ pod: &v1.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Namespace: "default", Namespace: "default",
OwnerReferences: []api.OwnerReference{ OwnerReferences: []v1.OwnerReference{
{Kind: "ReplicaSet", Name: "foo", UID: "qwert12345", Controller: &trueVar}, {Kind: "ReplicaSet", Name: "foo", UID: "qwert12345", Controller: &trueVar},
}, },
}, },
......
plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go
View file @ f782aba5
...@@ -20,8 +20,8 @@ import ( ...@@ -20,8 +20,8 @@ import (
"sync" "sync"
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
utilnode "k8s.io/kubernetes/pkg/util/node" utilnode "k8s.io/kubernetes/pkg/util/node"
"k8s.io/kubernetes/pkg/util/workqueue" "k8s.io/kubernetes/pkg/util/workqueue"
...@@ -57,7 +57,7 @@ func NewSelectorSpreadPriority( ...@@ -57,7 +57,7 @@ func NewSelectorSpreadPriority(
} }
// Returns selectors of services, RCs and RSs matching the given pod. // Returns selectors of services, RCs and RSs matching the given pod.
func getSelectors(pod *api.Pod, sl algorithm.ServiceLister, cl algorithm.ControllerLister, rsl algorithm.ReplicaSetLister) []labels.Selector { func getSelectors(pod *v1.Pod, sl algorithm.ServiceLister, cl algorithm.ControllerLister, rsl algorithm.ReplicaSetLister) []labels.Selector {
selectors := make([]labels.Selector, 0, 3) selectors := make([]labels.Selector, 0, 3)
if services, err := sl.GetPodServices(pod); err == nil { if services, err := sl.GetPodServices(pod); err == nil {
for _, service := range services { for _, service := range services {
...@@ -79,7 +79,7 @@ func getSelectors(pod *api.Pod, sl algorithm.ServiceLister, cl algorithm.Control ...@@ -79,7 +79,7 @@ func getSelectors(pod *api.Pod, sl algorithm.ServiceLister, cl algorithm.Control
return selectors return selectors
} }
func (s *SelectorSpread) getSelectors(pod *api.Pod) []labels.Selector { func (s *SelectorSpread) getSelectors(pod *v1.Pod) []labels.Selector {
return getSelectors(pod, s.serviceLister, s.controllerLister, s.replicaSetLister) return getSelectors(pod, s.serviceLister, s.controllerLister, s.replicaSetLister)
} }
...@@ -89,7 +89,7 @@ func (s *SelectorSpread) getSelectors(pod *api.Pod) []labels.Selector { ...@@ -89,7 +89,7 @@ func (s *SelectorSpread) getSelectors(pod *api.Pod) []labels.Selector {
// i.e. it pushes the scheduler towards a node where there's the smallest number of // i.e. it pushes the scheduler towards a node where there's the smallest number of
// pods which match the same service, RC or RS selectors as the pod being scheduled. // pods which match the same service, RC or RS selectors as the pod being scheduled.
// Where zone information is included on the nodes, it favors nodes in zones with fewer existing matching pods. // Where zone information is included on the nodes, it favors nodes in zones with fewer existing matching pods.
func (s *SelectorSpread) CalculateSpreadPriority(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodes []*api.Node) (schedulerapi.HostPriorityList, error) { func (s *SelectorSpread) CalculateSpreadPriority(pod *v1.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodes []*v1.Node) (schedulerapi.HostPriorityList, error) {
selectors := s.getSelectors(pod) selectors := s.getSelectors(pod)
// Count similar pods by node // Count similar pods by node
...@@ -199,8 +199,8 @@ func NewServiceAntiAffinityPriority(podLister algorithm.PodLister, serviceLister ...@@ -199,8 +199,8 @@ func NewServiceAntiAffinityPriority(podLister algorithm.PodLister, serviceLister
// CalculateAntiAffinityPriority spreads pods by minimizing the number of pods belonging to the same service // CalculateAntiAffinityPriority spreads pods by minimizing the number of pods belonging to the same service
// on machines with the same value for a particular label. // on machines with the same value for a particular label.
// The label to be considered is provided to the struct (ServiceAntiAffinity). // The label to be considered is provided to the struct (ServiceAntiAffinity).
func (s *ServiceAntiAffinity) CalculateAntiAffinityPriority(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodes []*api.Node) (schedulerapi.HostPriorityList, error) { func (s *ServiceAntiAffinity) CalculateAntiAffinityPriority(pod *v1.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodes []*v1.Node) (schedulerapi.HostPriorityList, error) {
var nsServicePods []*api.Pod var nsServicePods []*v1.Pod
if services, err := s.serviceLister.GetPodServices(pod); err == nil && len(services) > 0 { if services, err := s.serviceLister.GetPodServices(pod); err == nil && len(services) > 0 {
// just use the first service and get the other pods within the service // just use the first service and get the other pods within the service
// TODO: a separate predicate can be created that tries to handle all services for the pod // TODO: a separate predicate can be created that tries to handle all services for the pod
......
plugin/pkg/scheduler/algorithm/priorities/taint_toleration.go
View file @ f782aba5
...@@ -20,21 +20,21 @@ import ( ...@@ -20,21 +20,21 @@ import (
"fmt" "fmt"
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
// CountIntolerableTaintsPreferNoSchedule gives the count of intolerable taints of a pod with effect PreferNoSchedule // CountIntolerableTaintsPreferNoSchedule gives the count of intolerable taints of a pod with effect PreferNoSchedule
func countIntolerableTaintsPreferNoSchedule(taints []api.Taint, tolerations []api.Toleration) (intolerableTaints int) { func countIntolerableTaintsPreferNoSchedule(taints []v1.Taint, tolerations []v1.Toleration) (intolerableTaints int) {
for i := range taints { for i := range taints {
taint := &taints[i] taint := &taints[i]
// check only on taints that have effect PreferNoSchedule // check only on taints that have effect PreferNoSchedule
if taint.Effect != api.TaintEffectPreferNoSchedule { if taint.Effect != v1.TaintEffectPreferNoSchedule {
continue continue
} }
if !api.TaintToleratedByTolerations(taint, tolerations) { if !v1.TaintToleratedByTolerations(taint, tolerations) {
intolerableTaints++ intolerableTaints++
} }
} }
...@@ -42,18 +42,18 @@ func countIntolerableTaintsPreferNoSchedule(taints []api.Taint, tolerations []ap ...@@ -42,18 +42,18 @@ func countIntolerableTaintsPreferNoSchedule(taints []api.Taint, tolerations []ap
} }
// getAllTolerationEffectPreferNoSchedule gets the list of all Toleration with Effect PreferNoSchedule // getAllTolerationEffectPreferNoSchedule gets the list of all Toleration with Effect PreferNoSchedule
func getAllTolerationPreferNoSchedule(tolerations []api.Toleration) (tolerationList []api.Toleration) { func getAllTolerationPreferNoSchedule(tolerations []v1.Toleration) (tolerationList []v1.Toleration) {
for i := range tolerations { for i := range tolerations {
toleration := &tolerations[i] toleration := &tolerations[i]
if len(toleration.Effect) == 0 || toleration.Effect == api.TaintEffectPreferNoSchedule { if len(toleration.Effect) == 0 || toleration.Effect == v1.TaintEffectPreferNoSchedule {
tolerationList = append(tolerationList, *toleration) tolerationList = append(tolerationList, *toleration)
} }
} }
return return
} }
func getTolerationListFromPod(pod *api.Pod) ([]api.Toleration, error) { func getTolerationListFromPod(pod *v1.Pod) ([]v1.Toleration, error) {
tolerations, err := api.GetTolerationsFromPodAnnotations(pod.Annotations) tolerations, err := v1.GetTolerationsFromPodAnnotations(pod.Annotations)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -61,13 +61,13 @@ func getTolerationListFromPod(pod *api.Pod) ([]api.Toleration, error) { ...@@ -61,13 +61,13 @@ func getTolerationListFromPod(pod *api.Pod) ([]api.Toleration, error) {
} }
// ComputeTaintTolerationPriority prepares the priority list for all the nodes based on the number of intolerable taints on the node // ComputeTaintTolerationPriority prepares the priority list for all the nodes based on the number of intolerable taints on the node
func ComputeTaintTolerationPriorityMap(pod *api.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) { func ComputeTaintTolerationPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) {
node := nodeInfo.Node() node := nodeInfo.Node()
if node == nil { if node == nil {
return schedulerapi.HostPriority{}, fmt.Errorf("node not found") return schedulerapi.HostPriority{}, fmt.Errorf("node not found")
} }
var tolerationList []api.Toleration var tolerationList []v1.Toleration
if priorityMeta, ok := meta.(*priorityMetadata); ok { if priorityMeta, ok := meta.(*priorityMetadata); ok {
tolerationList = priorityMeta.podTolerations tolerationList = priorityMeta.podTolerations
} else { } else {
...@@ -78,7 +78,7 @@ func ComputeTaintTolerationPriorityMap(pod *api.Pod, meta interface{}, nodeInfo ...@@ -78,7 +78,7 @@ func ComputeTaintTolerationPriorityMap(pod *api.Pod, meta interface{}, nodeInfo
} }
} }
taints, err := api.GetTaintsFromNodeAnnotations(node.Annotations) taints, err := v1.GetTaintsFromNodeAnnotations(node.Annotations)
if err != nil { if err != nil {
return schedulerapi.HostPriority{}, err return schedulerapi.HostPriority{}, err
} }
...@@ -88,7 +88,7 @@ func ComputeTaintTolerationPriorityMap(pod *api.Pod, meta interface{}, nodeInfo ...@@ -88,7 +88,7 @@ func ComputeTaintTolerationPriorityMap(pod *api.Pod, meta interface{}, nodeInfo
}, nil }, nil
} }
func ComputeTaintTolerationPriorityReduce(pod *api.Pod, meta interface{}, nodeNameToInfo map[string]*schedulercache.NodeInfo, result schedulerapi.HostPriorityList) error { func ComputeTaintTolerationPriorityReduce(pod *v1.Pod, meta interface{}, nodeNameToInfo map[string]*schedulercache.NodeInfo, result schedulerapi.HostPriorityList) error {
var maxCount int var maxCount int
for i := range result { for i := range result {
if result[i].Score > maxCount { if result[i].Score > maxCount {
......
plugin/pkg/scheduler/algorithm/priorities/taint_toleration_test.go
View file @ f782aba5
...@@ -21,29 +21,29 @@ import ( ...@@ -21,29 +21,29 @@ import (
"reflect" "reflect"
"testing" "testing"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
func nodeWithTaints(nodeName string, taints []api.Taint) *api.Node { func nodeWithTaints(nodeName string, taints []v1.Taint) *v1.Node {
taintsData, _ := json.Marshal(taints) taintsData, _ := json.Marshal(taints)
return &api.Node{ return &v1.Node{
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Name: nodeName, Name: nodeName,
Annotations: map[string]string{ Annotations: map[string]string{
api.TaintsAnnotationKey: string(taintsData), v1.TaintsAnnotationKey: string(taintsData),
}, },
}, },
} }
} }
func podWithTolerations(tolerations []api.Toleration) *api.Pod { func podWithTolerations(tolerations []v1.Toleration) *v1.Pod {
tolerationData, _ := json.Marshal(tolerations) tolerationData, _ := json.Marshal(tolerations)
return &api.Pod{ return &v1.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Annotations: map[string]string{ Annotations: map[string]string{
api.TolerationsAnnotationKey: string(tolerationData), v1.TolerationsAnnotationKey: string(tolerationData),
}, },
}, },
} }
...@@ -55,30 +55,30 @@ func podWithTolerations(tolerations []api.Toleration) *api.Pod { ...@@ -55,30 +55,30 @@ func podWithTolerations(tolerations []api.Toleration) *api.Pod {
func TestTaintAndToleration(t *testing.T) { func TestTaintAndToleration(t *testing.T) {
tests := []struct { tests := []struct {
pod *api.Pod pod *v1.Pod
nodes []*api.Node nodes []*v1.Node
expectedList schedulerapi.HostPriorityList expectedList schedulerapi.HostPriorityList
test string test string
}{ }{
// basic test case // basic test case
{ {
test: "node with taints tolerated by the pod, gets a higher score than those node with intolerable taints", test: "node with taints tolerated by the pod, gets a higher score than those node with intolerable taints",
pod: podWithTolerations([]api.Toleration{{ pod: podWithTolerations([]v1.Toleration{{
Key: "foo", Key: "foo",
Operator: api.TolerationOpEqual, Operator: v1.TolerationOpEqual,
Value: "bar", Value: "bar",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}}), }}),
nodes: []*api.Node{ nodes: []*v1.Node{
nodeWithTaints("nodeA", []api.Taint{{ nodeWithTaints("nodeA", []v1.Taint{{
Key: "foo", Key: "foo",
Value: "bar", Value: "bar",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}}), }}),
nodeWithTaints("nodeB", []api.Taint{{ nodeWithTaints("nodeB", []v1.Taint{{
Key: "foo", Key: "foo",
Value: "blah", Value: "blah",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}}), }}),
}, },
expectedList: []schedulerapi.HostPriority{ expectedList: []schedulerapi.HostPriority{
...@@ -89,37 +89,37 @@ func TestTaintAndToleration(t *testing.T) { ...@@ -89,37 +89,37 @@ func TestTaintAndToleration(t *testing.T) {
// the count of taints that are tolerated by pod, does not matter. // the count of taints that are tolerated by pod, does not matter.
{ {
test: "the nodes that all of their taints are tolerated by the pod, get the same score, no matter how many tolerable taints a node has", test: "the nodes that all of their taints are tolerated by the pod, get the same score, no matter how many tolerable taints a node has",
pod: podWithTolerations([]api.Toleration{ pod: podWithTolerations([]v1.Toleration{
{ {
Key: "cpu-type", Key: "cpu-type",
Operator: api.TolerationOpEqual, Operator: v1.TolerationOpEqual,
Value: "arm64", Value: "arm64",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}, { }, {
Key: "disk-type", Key: "disk-type",
Operator: api.TolerationOpEqual, Operator: v1.TolerationOpEqual,
Value: "ssd", Value: "ssd",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}, },
}), }),
nodes: []*api.Node{ nodes: []*v1.Node{
nodeWithTaints("nodeA", []api.Taint{}), nodeWithTaints("nodeA", []v1.Taint{}),
nodeWithTaints("nodeB", []api.Taint{ nodeWithTaints("nodeB", []v1.Taint{
{ {
Key: "cpu-type", Key: "cpu-type",
Value: "arm64", Value: "arm64",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}, },
}), }),
nodeWithTaints("nodeC", []api.Taint{ nodeWithTaints("nodeC", []v1.Taint{
{ {
Key: "cpu-type", Key: "cpu-type",
Value: "arm64", Value: "arm64",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}, { }, {
Key: "disk-type", Key: "disk-type",
Value: "ssd", Value: "ssd",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}, },
}), }),
}, },
...@@ -132,30 +132,30 @@ func TestTaintAndToleration(t *testing.T) { ...@@ -132,30 +132,30 @@ func TestTaintAndToleration(t *testing.T) {
// the count of taints on a node that are not tolerated by pod, matters. // the count of taints on a node that are not tolerated by pod, matters.
{ {
test: "the more intolerable taints a node has, the lower score it gets.", test: "the more intolerable taints a node has, the lower score it gets.",
pod: podWithTolerations([]api.Toleration{{ pod: podWithTolerations([]v1.Toleration{{
Key: "foo", Key: "foo",
Operator: api.TolerationOpEqual, Operator: v1.TolerationOpEqual,
Value: "bar", Value: "bar",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}}), }}),
nodes: []*api.Node{ nodes: []*v1.Node{
nodeWithTaints("nodeA", []api.Taint{}), nodeWithTaints("nodeA", []v1.Taint{}),
nodeWithTaints("nodeB", []api.Taint{ nodeWithTaints("nodeB", []v1.Taint{
{ {
Key: "cpu-type", Key: "cpu-type",
Value: "arm64", Value: "arm64",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}, },
}), }),
nodeWithTaints("nodeC", []api.Taint{ nodeWithTaints("nodeC", []v1.Taint{
{ {
Key: "cpu-type", Key: "cpu-type",
Value: "arm64", Value: "arm64",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}, { }, {
Key: "disk-type", Key: "disk-type",
Value: "ssd", Value: "ssd",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}, },
}), }),
}, },
...@@ -168,37 +168,37 @@ func TestTaintAndToleration(t *testing.T) { ...@@ -168,37 +168,37 @@ func TestTaintAndToleration(t *testing.T) {
// taints-tolerations priority only takes care about the taints and tolerations that have effect PreferNoSchedule // taints-tolerations priority only takes care about the taints and tolerations that have effect PreferNoSchedule
{ {
test: "only taints and tolerations that have effect PreferNoSchedule are checked by taints-tolerations priority function", test: "only taints and tolerations that have effect PreferNoSchedule are checked by taints-tolerations priority function",
pod: podWithTolerations([]api.Toleration{ pod: podWithTolerations([]v1.Toleration{
{ {
Key: "cpu-type", Key: "cpu-type",
Operator: api.TolerationOpEqual, Operator: v1.TolerationOpEqual,
Value: "arm64", Value: "arm64",
Effect: api.TaintEffectNoSchedule, Effect: v1.TaintEffectNoSchedule,
}, { }, {
Key: "disk-type", Key: "disk-type",
Operator: api.TolerationOpEqual, Operator: v1.TolerationOpEqual,
Value: "ssd", Value: "ssd",
Effect: api.TaintEffectNoSchedule, Effect: v1.TaintEffectNoSchedule,
}, },
}), }),
nodes: []*api.Node{ nodes: []*v1.Node{
nodeWithTaints("nodeA", []api.Taint{}), nodeWithTaints("nodeA", []v1.Taint{}),
nodeWithTaints("nodeB", []api.Taint{ nodeWithTaints("nodeB", []v1.Taint{
{ {
Key: "cpu-type", Key: "cpu-type",
Value: "arm64", Value: "arm64",
Effect: api.TaintEffectNoSchedule, Effect: v1.TaintEffectNoSchedule,
}, },
}), }),
nodeWithTaints("nodeC", []api.Taint{ nodeWithTaints("nodeC", []v1.Taint{
{ {
Key: "cpu-type", Key: "cpu-type",
Value: "arm64", Value: "arm64",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}, { }, {
Key: "disk-type", Key: "disk-type",
Value: "ssd", Value: "ssd",
Effect: api.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
}, },
}), }),
}, },
......
plugin/pkg/scheduler/algorithm/priorities/test_util.go
View file @ f782aba5
...@@ -17,22 +17,22 @@ limitations under the License. ...@@ -17,22 +17,22 @@ limitations under the License.
package priorities package priorities
import ( import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
func makeNode(node string, milliCPU, memory int64) *api.Node { func makeNode(node string, milliCPU, memory int64) *v1.Node {
return &api.Node{ return &v1.Node{
ObjectMeta: api.ObjectMeta{Name: node}, ObjectMeta: v1.ObjectMeta{Name: node},
Status: api.NodeStatus{ Status: v1.NodeStatus{
Capacity: api.ResourceList{ Capacity: v1.ResourceList{
"cpu": *resource.NewMilliQuantity(milliCPU, resource.DecimalSI), "cpu": *resource.NewMilliQuantity(milliCPU, resource.DecimalSI),
"memory": *resource.NewQuantity(memory, resource.BinarySI), "memory": *resource.NewQuantity(memory, resource.BinarySI),
}, },
Allocatable: api.ResourceList{ Allocatable: v1.ResourceList{
"cpu": *resource.NewMilliQuantity(milliCPU, resource.DecimalSI), "cpu": *resource.NewMilliQuantity(milliCPU, resource.DecimalSI),
"memory": *resource.NewQuantity(memory, resource.BinarySI), "memory": *resource.NewQuantity(memory, resource.BinarySI),
}, },
...@@ -41,7 +41,7 @@ func makeNode(node string, milliCPU, memory int64) *api.Node { ...@@ -41,7 +41,7 @@ func makeNode(node string, milliCPU, memory int64) *api.Node {
} }
func priorityFunction(mapFn algorithm.PriorityMapFunction, reduceFn algorithm.PriorityReduceFunction) algorithm.PriorityFunction { func priorityFunction(mapFn algorithm.PriorityMapFunction, reduceFn algorithm.PriorityReduceFunction) algorithm.PriorityFunction {
return func(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodes []*api.Node) (schedulerapi.HostPriorityList, error) { return func(pod *v1.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodes []*v1.Node) (schedulerapi.HostPriorityList, error) {
result := make(schedulerapi.HostPriorityList, 0, len(nodes)) result := make(schedulerapi.HostPriorityList, 0, len(nodes))
for i := range nodes { for i := range nodes {
hostResult, err := mapFn(pod, nil, nodeNameToInfo[nodes[i].Name]) hostResult, err := mapFn(pod, nil, nodeNameToInfo[nodes[i].Name])
......
plugin/pkg/scheduler/algorithm/priorities/util/non_zero.go
View file @ f782aba5
...@@ -16,9 +16,7 @@ limitations under the License. ...@@ -16,9 +16,7 @@ limitations under the License.
package util package util
import ( import "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api"
)
// For each of these resources, a pod that doesn't request the resource explicitly // For each of these resources, a pod that doesn't request the resource explicitly
// will be treated as having requested the amount indicated below, for the purpose // will be treated as having requested the amount indicated below, for the purpose
...@@ -32,18 +30,18 @@ const DefaultMilliCpuRequest int64 = 100 // 0.1 core ...@@ -32,18 +30,18 @@ const DefaultMilliCpuRequest int64 = 100 // 0.1 core
const DefaultMemoryRequest int64 = 200 * 1024 * 1024 // 200 MB const DefaultMemoryRequest int64 = 200 * 1024 * 1024 // 200 MB
// GetNonzeroRequests returns the default resource request if none is found or what is provided on the request // GetNonzeroRequests returns the default resource request if none is found or what is provided on the request
// TODO: Consider setting default as a fixed fraction of machine capacity (take "capacity api.ResourceList" // TODO: Consider setting default as a fixed fraction of machine capacity (take "capacity v1.ResourceList"
// as an additional argument here) rather than using constants // as an additional argument here) rather than using constants
func GetNonzeroRequests(requests *api.ResourceList) (int64, int64) { func GetNonzeroRequests(requests *v1.ResourceList) (int64, int64) {
var outMilliCPU, outMemory int64 var outMilliCPU, outMemory int64
// Override if un-set, but not if explicitly set to zero // Override if un-set, but not if explicitly set to zero
if _, found := (*requests)[api.ResourceCPU]; !found { if _, found := (*requests)[v1.ResourceCPU]; !found {
outMilliCPU = DefaultMilliCpuRequest outMilliCPU = DefaultMilliCpuRequest
} else { } else {
outMilliCPU = requests.Cpu().MilliValue() outMilliCPU = requests.Cpu().MilliValue()
} }
// Override if un-set, but not if explicitly set to zero // Override if un-set, but not if explicitly set to zero
if _, found := (*requests)[api.ResourceMemory]; !found { if _, found := (*requests)[v1.ResourceMemory]; !found {
outMemory = DefaultMemoryRequest outMemory = DefaultMemoryRequest
} else { } else {
outMemory = requests.Memory().Value() outMemory = requests.Memory().Value()
......
plugin/pkg/scheduler/algorithm/priorities/util/topologies.go
View file @ f782aba5
...@@ -17,8 +17,8 @@ limitations under the License. ...@@ -17,8 +17,8 @@ limitations under the License.
package util package util
import ( import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
) )
...@@ -27,7 +27,7 @@ import ( ...@@ -27,7 +27,7 @@ import (
// according to the namespaces indicated in podAffinityTerm. // according to the namespaces indicated in podAffinityTerm.
// 1. If the namespaces is nil considers the given pod's namespace // 1. If the namespaces is nil considers the given pod's namespace
// 2. If the namespaces is empty list then considers all the namespaces // 2. If the namespaces is empty list then considers all the namespaces
func getNamespacesFromPodAffinityTerm(pod *api.Pod, podAffinityTerm api.PodAffinityTerm) sets.String { func getNamespacesFromPodAffinityTerm(pod *v1.Pod, podAffinityTerm v1.PodAffinityTerm) sets.String {
names := sets.String{} names := sets.String{}
if podAffinityTerm.Namespaces == nil { if podAffinityTerm.Namespaces == nil {
names.Insert(pod.Namespace) names.Insert(pod.Namespace)
...@@ -39,7 +39,7 @@ func getNamespacesFromPodAffinityTerm(pod *api.Pod, podAffinityTerm api.PodAffin ...@@ -39,7 +39,7 @@ func getNamespacesFromPodAffinityTerm(pod *api.Pod, podAffinityTerm api.PodAffin
// PodMatchesTermsNamespaceAndSelector returns true if the given <pod> // PodMatchesTermsNamespaceAndSelector returns true if the given <pod>
// matches the namespace and selector defined by <affinityPod>`s <term>. // matches the namespace and selector defined by <affinityPod>`s <term>.
func PodMatchesTermsNamespaceAndSelector(pod *api.Pod, affinityPod *api.Pod, term *api.PodAffinityTerm) (bool, error) { func PodMatchesTermsNamespaceAndSelector(pod *v1.Pod, affinityPod *v1.Pod, term *v1.PodAffinityTerm) (bool, error) {
namespaces := getNamespacesFromPodAffinityTerm(affinityPod, *term) namespaces := getNamespacesFromPodAffinityTerm(affinityPod, *term)
if len(namespaces) != 0 && !namespaces.Has(pod.Namespace) { if len(namespaces) != 0 && !namespaces.Has(pod.Namespace) {
return false, nil return false, nil
...@@ -53,7 +53,7 @@ func PodMatchesTermsNamespaceAndSelector(pod *api.Pod, affinityPod *api.Pod, ter ...@@ -53,7 +53,7 @@ func PodMatchesTermsNamespaceAndSelector(pod *api.Pod, affinityPod *api.Pod, ter
} }
// nodesHaveSameTopologyKeyInternal checks if nodeA and nodeB have same label value with given topologyKey as label key. // nodesHaveSameTopologyKeyInternal checks if nodeA and nodeB have same label value with given topologyKey as label key.
func nodesHaveSameTopologyKeyInternal(nodeA, nodeB *api.Node, topologyKey string) bool { func nodesHaveSameTopologyKeyInternal(nodeA, nodeB *v1.Node, topologyKey string) bool {
return nodeA.Labels != nil && nodeB.Labels != nil && len(nodeA.Labels[topologyKey]) > 0 && nodeA.Labels[topologyKey] == nodeB.Labels[topologyKey] return nodeA.Labels != nil && nodeB.Labels != nil && len(nodeA.Labels[topologyKey]) > 0 && nodeA.Labels[topologyKey] == nodeB.Labels[topologyKey]
} }
...@@ -63,7 +63,7 @@ type Topologies struct { ...@@ -63,7 +63,7 @@ type Topologies struct {
// NodesHaveSameTopologyKey checks if nodeA and nodeB have same label value with given topologyKey as label key. // NodesHaveSameTopologyKey checks if nodeA and nodeB have same label value with given topologyKey as label key.
// If the topologyKey is nil/empty, check if the two nodes have any of the default topologyKeys, and have same corresponding label value. // If the topologyKey is nil/empty, check if the two nodes have any of the default topologyKeys, and have same corresponding label value.
func (tps *Topologies) NodesHaveSameTopologyKey(nodeA, nodeB *api.Node, topologyKey string) bool { func (tps *Topologies) NodesHaveSameTopologyKey(nodeA, nodeB *v1.Node, topologyKey string) bool {
if len(topologyKey) == 0 { if len(topologyKey) == 0 {
// assumes this is allowed only for PreferredDuringScheduling pod anti-affinity (ensured by api/validation) // assumes this is allowed only for PreferredDuringScheduling pod anti-affinity (ensured by api/validation)
for _, defaultKey := range tps.DefaultKeys { for _, defaultKey := range tps.DefaultKeys {
......
plugin/pkg/scheduler/algorithm/priorities/util/util.go
View file @ f782aba5
...@@ -16,11 +16,9 @@ limitations under the License. ...@@ -16,11 +16,9 @@ limitations under the License.
package util package util
import ( import "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api"
)
func GetControllerRef(pod *api.Pod) *api.OwnerReference { func GetControllerRef(pod *v1.Pod) *v1.OwnerReference {
if len(pod.OwnerReferences) == 0 { if len(pod.OwnerReferences) == 0 {
return nil return nil
} }
......
plugin/pkg/scheduler/algorithm/scheduler_interface.go
View file @ f782aba5
...@@ -17,7 +17,7 @@ limitations under the License. ...@@ -17,7 +17,7 @@ limitations under the License.
package algorithm package algorithm
import ( import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
) )
...@@ -28,16 +28,16 @@ type SchedulerExtender interface { ...@@ -28,16 +28,16 @@ type SchedulerExtender interface {
// Filter based on extender-implemented predicate functions. The filtered list is // Filter based on extender-implemented predicate functions. The filtered list is
// expected to be a subset of the supplied list. failedNodesMap optionally contains // expected to be a subset of the supplied list. failedNodesMap optionally contains
// the list of failed nodes and failure reasons. // the list of failed nodes and failure reasons.
Filter(pod *api.Pod, nodes []*api.Node) (filteredNodes []*api.Node, failedNodesMap schedulerapi.FailedNodesMap, err error) Filter(pod *v1.Pod, nodes []*v1.Node) (filteredNodes []*v1.Node, failedNodesMap schedulerapi.FailedNodesMap, err error)
// Prioritize based on extender-implemented priority functions. The returned scores & weight // 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 // 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. // the scores computed by Kubernetes scheduler. The total scores are used to do the host selection.
Prioritize(pod *api.Pod, nodes []*api.Node) (hostPriorities *schedulerapi.HostPriorityList, weight int, err error) Prioritize(pod *v1.Pod, nodes []*v1.Node) (hostPriorities *schedulerapi.HostPriorityList, weight int, err error)
} }
// ScheduleAlgorithm is an interface implemented by things that know how to schedule pods // ScheduleAlgorithm is an interface implemented by things that know how to schedule pods
// onto machines. // onto machines.
type ScheduleAlgorithm interface { type ScheduleAlgorithm interface {
Schedule(*api.Pod, NodeLister) (selectedMachine string, err error) Schedule(*v1.Pod, NodeLister) (selectedMachine string, err error)
} }
plugin/pkg/scheduler/algorithm/scheduler_interface_test.go
View file @ f782aba5
...@@ -19,7 +19,7 @@ package algorithm ...@@ -19,7 +19,7 @@ package algorithm
import ( import (
"testing" "testing"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
) )
// Some functions used by multiple scheduler tests. // Some functions used by multiple scheduler tests.
...@@ -31,7 +31,7 @@ type schedulerTester struct { ...@@ -31,7 +31,7 @@ type schedulerTester struct {
} }
// Call if you know exactly where pod should get scheduled. // Call if you know exactly where pod should get scheduled.
func (st *schedulerTester) expectSchedule(pod *api.Pod, expected string) { func (st *schedulerTester) expectSchedule(pod *v1.Pod, expected string) {
actual, err := st.scheduler.Schedule(pod, st.nodeLister) actual, err := st.scheduler.Schedule(pod, st.nodeLister)
if err != nil { if err != nil {
st.t.Errorf("Unexpected error %v\nTried to schedule: %#v", err, pod) st.t.Errorf("Unexpected error %v\nTried to schedule: %#v", err, pod)
...@@ -43,7 +43,7 @@ func (st *schedulerTester) expectSchedule(pod *api.Pod, expected string) { ...@@ -43,7 +43,7 @@ func (st *schedulerTester) expectSchedule(pod *api.Pod, expected string) {
} }
// Call if you can't predict where pod will be scheduled. // Call if you can't predict where pod will be scheduled.
func (st *schedulerTester) expectSuccess(pod *api.Pod) { func (st *schedulerTester) expectSuccess(pod *v1.Pod) {
_, err := st.scheduler.Schedule(pod, st.nodeLister) _, err := st.scheduler.Schedule(pod, st.nodeLister)
if err != nil { if err != nil {
st.t.Errorf("Unexpected error %v\nTried to schedule: %#v", err, pod) st.t.Errorf("Unexpected error %v\nTried to schedule: %#v", err, pod)
...@@ -52,7 +52,7 @@ func (st *schedulerTester) expectSuccess(pod *api.Pod) { ...@@ -52,7 +52,7 @@ func (st *schedulerTester) expectSuccess(pod *api.Pod) {
} }
// Call if pod should *not* schedule. // Call if pod should *not* schedule.
func (st *schedulerTester) expectFailure(pod *api.Pod) { func (st *schedulerTester) expectFailure(pod *v1.Pod) {
_, err := st.scheduler.Schedule(pod, st.nodeLister) _, err := st.scheduler.Schedule(pod, st.nodeLister)
if err == nil { if err == nil {
st.t.Error("Unexpected non-error") st.t.Error("Unexpected non-error")
......
plugin/pkg/scheduler/algorithm/types.go
View file @ f782aba5
...@@ -17,7 +17,7 @@ limitations under the License. ...@@ -17,7 +17,7 @@ limitations under the License.
package algorithm package algorithm
import ( import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
...@@ -25,25 +25,25 @@ import ( ...@@ -25,25 +25,25 @@ import (
// FitPredicate is a function that indicates if a pod fits into an existing node. // FitPredicate is a function that indicates if a pod fits into an existing node.
// The failure information is given by the error. // The failure information is given by the error.
// TODO: Change interface{} to a specific type. // TODO: Change interface{} to a specific type.
type FitPredicate func(pod *api.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (bool, []PredicateFailureReason, error) type FitPredicate func(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (bool, []PredicateFailureReason, error)
// PriorityMapFunction is a function that computes per-node results for a given node. // PriorityMapFunction is a function that computes per-node results for a given node.
// TODO: Figure out the exact API of this method. // TODO: Figure out the exact API of this method.
// TODO: Change interface{} to a specific type. // TODO: Change interface{} to a specific type.
type PriorityMapFunction func(pod *api.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) type PriorityMapFunction func(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error)
// PriorityReduceFunction is a function that aggregated per-node results and computes // PriorityReduceFunction is a function that aggregated per-node results and computes
// final scores for all nodes. // final scores for all nodes.
// TODO: Figure out the exact API of this method. // TODO: Figure out the exact API of this method.
// TODO: Change interface{} to a specific type. // TODO: Change interface{} to a specific type.
type PriorityReduceFunction func(pod *api.Pod, meta interface{}, nodeNameToInfo map[string]*schedulercache.NodeInfo, result schedulerapi.HostPriorityList) error type PriorityReduceFunction func(pod *v1.Pod, meta interface{}, nodeNameToInfo map[string]*schedulercache.NodeInfo, result schedulerapi.HostPriorityList) error
// MetdataProducer is a function that computes metadata for a given pod. // MetdataProducer is a function that computes metadata for a given pod.
type MetadataProducer func(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo) interface{} type MetadataProducer func(pod *v1.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo) interface{}
// DEPRECATED // DEPRECATED
// Use Map-Reduce pattern for priority functions. // Use Map-Reduce pattern for priority functions.
type PriorityFunction func(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodes []*api.Node) (schedulerapi.HostPriorityList, error) type PriorityFunction func(pod *v1.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodes []*v1.Node) (schedulerapi.HostPriorityList, error)
type PriorityConfig struct { type PriorityConfig struct {
Map PriorityMapFunction Map PriorityMapFunction
...@@ -55,7 +55,7 @@ type PriorityConfig struct { ...@@ -55,7 +55,7 @@ type PriorityConfig struct {
} }
// EmptyMetadataProducer returns a no-op MetadataProducer type. // EmptyMetadataProducer returns a no-op MetadataProducer type.
func EmptyMetadataProducer(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo) interface{} { func EmptyMetadataProducer(pod *v1.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo) interface{} {
return nil return nil
} }
...@@ -63,4 +63,4 @@ type PredicateFailureReason interface { ...@@ -63,4 +63,4 @@ type PredicateFailureReason interface {
GetReason() string GetReason() string
} }
type GetEquivalencePodFunc func(pod *api.Pod) interface{} type GetEquivalencePodFunc func(pod *v1.Pod) interface{}
plugin/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go
View file @ f782aba5
...@@ -23,9 +23,9 @@ import ( ...@@ -23,9 +23,9 @@ import (
"net/http/httptest" "net/http/httptest"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apimachinery/registered"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
"k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
...@@ -338,9 +338,9 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { ...@@ -338,9 +338,9 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
} }
server := httptest.NewServer(&handler) server := httptest.NewServer(&handler)
defer server.Close() defer server.Close()
client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &registered.GroupOrDie(api.GroupName).GroupVersion}}) client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &registered.GroupOrDie(v1.GroupName).GroupVersion}})
if _, err := factory.NewConfigFactory(client, "some-scheduler-name", api.DefaultHardPodAffinitySymmetricWeight, api.DefaultFailureDomains).CreateFromConfig(policy); err != nil { if _, err := factory.NewConfigFactory(client, "some-scheduler-name", v1.DefaultHardPodAffinitySymmetricWeight, v1.DefaultFailureDomains).CreateFromConfig(policy); err != nil {
t.Errorf("%s: Error constructing: %v", v, err) t.Errorf("%s: Error constructing: %v", v, err)
continue continue
} }
......
plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go
View file @ f782aba5
...@@ -21,7 +21,7 @@ import ( ...@@ -21,7 +21,7 @@ import (
"os" "os"
"strconv" "strconv"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/plugin/pkg/scheduler" "k8s.io/kubernetes/plugin/pkg/scheduler"
...@@ -228,7 +228,7 @@ func copyAndReplace(set sets.String, replaceWhat, replaceWith string) sets.Strin ...@@ -228,7 +228,7 @@ func copyAndReplace(set sets.String, replaceWhat, replaceWith string) sets.Strin
} }
// GetEquivalencePod returns a EquivalencePod which contains a group of pod attributes which can be reused. // GetEquivalencePod returns a EquivalencePod which contains a group of pod attributes which can be reused.
func GetEquivalencePod(pod *api.Pod) interface{} { func GetEquivalencePod(pod *v1.Pod) interface{} {
equivalencePod := EquivalencePod{} equivalencePod := EquivalencePod{}
// For now we only consider pods: // For now we only consider pods:
// 1. OwnerReferences is Controller // 1. OwnerReferences is Controller
...@@ -260,5 +260,5 @@ func isValidControllerKind(kind string) bool { ...@@ -260,5 +260,5 @@ func isValidControllerKind(kind string) bool {
// EquivalencePod is a group of pod attributes which can be reused as equivalence to schedule other pods. // EquivalencePod is a group of pod attributes which can be reused as equivalence to schedule other pods.
type EquivalencePod struct { type EquivalencePod struct {
ControllerRef api.OwnerReference ControllerRef v1.OwnerReference
} }
plugin/pkg/scheduler/api/types.go
View file @ f782aba5
...@@ -19,8 +19,8 @@ package api ...@@ -19,8 +19,8 @@ package api
import ( import (
"time" "time"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient"
) )
...@@ -134,9 +134,9 @@ type ExtenderConfig struct { ...@@ -134,9 +134,9 @@ type ExtenderConfig struct {
// nodes for a pod. // nodes for a pod.
type ExtenderArgs struct { type ExtenderArgs struct {
// Pod being scheduled // Pod being scheduled
Pod api.Pod `json:"pod"` Pod v1.Pod `json:"pod"`
// List of candidate nodes where the pod can be scheduled // List of candidate nodes where the pod can be scheduled
Nodes api.NodeList `json:"nodes"` Nodes v1.NodeList `json:"nodes"`
} }
// FailedNodesMap represents the filtered out nodes, with node names and failure messages // FailedNodesMap represents the filtered out nodes, with node names and failure messages
...@@ -145,7 +145,7 @@ type FailedNodesMap map[string]string ...@@ -145,7 +145,7 @@ type FailedNodesMap map[string]string
// ExtenderFilterResult represents the results of a filter call to an extender // ExtenderFilterResult represents the results of a filter call to an extender
type ExtenderFilterResult struct { type ExtenderFilterResult struct {
// Filtered set of nodes where the pod can be scheduled // Filtered set of nodes where the pod can be scheduled
Nodes api.NodeList `json:"nodes,omitempty"` Nodes v1.NodeList `json:"nodes,omitempty"`
// Filtered out nodes where the pod can't be scheduled and the failure messages // Filtered out nodes where the pod can't be scheduled and the failure messages
FailedNodes FailedNodesMap `json:"failedNodes,omitempty"` FailedNodes FailedNodesMap `json:"failedNodes,omitempty"`
// Error message indicating failure // Error message indicating failure
......
plugin/pkg/scheduler/equivalence_cache.go
View file @ f782aba5
...@@ -17,13 +17,15 @@ limitations under the License. ...@@ -17,13 +17,15 @@ limitations under the License.
package scheduler package scheduler
import ( import (
"github.com/golang/groupcache/lru"
"hash/adler32" "hash/adler32"
"k8s.io/kubernetes/pkg/api" "github.com/golang/groupcache/lru"
"sync"
"k8s.io/kubernetes/pkg/api/v1"
hashutil "k8s.io/kubernetes/pkg/util/hash" hashutil "k8s.io/kubernetes/pkg/util/hash"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
"sync"
) )
// TODO(harryz) figure out the right number for this, 4096 may be too big // TODO(harryz) figure out the right number for this, 4096 may be too big
...@@ -68,7 +70,7 @@ func (ec *EquivalenceCache) addPodPredicate(podKey uint64, nodeName string, fit ...@@ -68,7 +70,7 @@ func (ec *EquivalenceCache) addPodPredicate(podKey uint64, nodeName string, fit
} }
// AddPodPredicatesCache cache pod predicate for equivalence class // AddPodPredicatesCache cache pod predicate for equivalence class
func (ec *EquivalenceCache) AddPodPredicatesCache(pod *api.Pod, fitNodeList []*api.Node, failedPredicates *FailedPredicateMap) { func (ec *EquivalenceCache) AddPodPredicatesCache(pod *v1.Pod, fitNodeList []*v1.Node, failedPredicates *FailedPredicateMap) {
equivalenceHash := ec.hashEquivalencePod(pod) equivalenceHash := ec.hashEquivalencePod(pod)
for _, fitNode := range fitNodeList { for _, fitNode := range fitNodeList {
...@@ -80,10 +82,10 @@ func (ec *EquivalenceCache) AddPodPredicatesCache(pod *api.Pod, fitNodeList []*a ...@@ -80,10 +82,10 @@ func (ec *EquivalenceCache) AddPodPredicatesCache(pod *api.Pod, fitNodeList []*a
} }
// GetCachedPredicates gets cached predicates for equivalence class // GetCachedPredicates gets cached predicates for equivalence class
func (ec *EquivalenceCache) GetCachedPredicates(pod *api.Pod, nodes []*api.Node) ([]*api.Node, FailedPredicateMap, []*api.Node) { func (ec *EquivalenceCache) GetCachedPredicates(pod *v1.Pod, nodes []*v1.Node) ([]*v1.Node, FailedPredicateMap, []*v1.Node) {
fitNodeList := []*api.Node{} fitNodeList := []*v1.Node{}
failedPredicates := FailedPredicateMap{} failedPredicates := FailedPredicateMap{}
noCacheNodeList := []*api.Node{} noCacheNodeList := []*v1.Node{}
equivalenceHash := ec.hashEquivalencePod(pod) equivalenceHash := ec.hashEquivalencePod(pod)
for _, node := range nodes { for _, node := range nodes {
findCache := false findCache := false
...@@ -124,7 +126,7 @@ func (ec *EquivalenceCache) SendClearAllCacheReq() { ...@@ -124,7 +126,7 @@ func (ec *EquivalenceCache) SendClearAllCacheReq() {
} }
// hashEquivalencePod returns the hash of equivalence pod. // hashEquivalencePod returns the hash of equivalence pod.
func (ec *EquivalenceCache) hashEquivalencePod(pod *api.Pod) uint64 { func (ec *EquivalenceCache) hashEquivalencePod(pod *v1.Pod) uint64 {
equivalencePod := ec.getEquivalencePod(pod) equivalencePod := ec.getEquivalencePod(pod)
hash := adler32.New() hash := adler32.New()
hashutil.DeepHashObject(hash, equivalencePod) hashutil.DeepHashObject(hash, equivalencePod)
......
plugin/pkg/scheduler/extender.go
View file @ f782aba5
...@@ -24,7 +24,7 @@ import ( ...@@ -24,7 +24,7 @@ import (
"net/http" "net/http"
"time" "time"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient"
utilnet "k8s.io/kubernetes/pkg/util/net" utilnet "k8s.io/kubernetes/pkg/util/net"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
...@@ -94,20 +94,20 @@ func NewHTTPExtender(config *schedulerapi.ExtenderConfig, apiVersion string) (al ...@@ -94,20 +94,20 @@ func NewHTTPExtender(config *schedulerapi.ExtenderConfig, apiVersion string) (al
// Filter based on extender implemented predicate functions. The filtered list is // Filter based on extender implemented predicate functions. The filtered list is
// expected to be a subset of the supplied list. failedNodesMap optionally contains // expected to be a subset of the supplied list. failedNodesMap optionally contains
// the list of failed nodes and failure reasons. // the list of failed nodes and failure reasons.
func (h *HTTPExtender) Filter(pod *api.Pod, nodes []*api.Node) ([]*api.Node, schedulerapi.FailedNodesMap, error) { func (h *HTTPExtender) Filter(pod *v1.Pod, nodes []*v1.Node) ([]*v1.Node, schedulerapi.FailedNodesMap, error) {
var result schedulerapi.ExtenderFilterResult var result schedulerapi.ExtenderFilterResult
if h.filterVerb == "" { if h.filterVerb == "" {
return nodes, schedulerapi.FailedNodesMap{}, nil return nodes, schedulerapi.FailedNodesMap{}, nil
} }
nodeItems := make([]api.Node, 0, len(nodes)) nodeItems := make([]v1.Node, 0, len(nodes))
for _, node := range nodes { for _, node := range nodes {
nodeItems = append(nodeItems, *node) nodeItems = append(nodeItems, *node)
} }
args := schedulerapi.ExtenderArgs{ args := schedulerapi.ExtenderArgs{
Pod: *pod, Pod: *pod,
Nodes: api.NodeList{Items: nodeItems}, Nodes: v1.NodeList{Items: nodeItems},
} }
if err := h.send(h.filterVerb, &args, &result); err != nil { if err := h.send(h.filterVerb, &args, &result); err != nil {
...@@ -117,7 +117,7 @@ func (h *HTTPExtender) Filter(pod *api.Pod, nodes []*api.Node) ([]*api.Node, sch ...@@ -117,7 +117,7 @@ func (h *HTTPExtender) Filter(pod *api.Pod, nodes []*api.Node) ([]*api.Node, sch
return nil, nil, fmt.Errorf(result.Error) return nil, nil, fmt.Errorf(result.Error)
} }
nodeResult := make([]*api.Node, 0, len(result.Nodes.Items)) nodeResult := make([]*v1.Node, 0, len(result.Nodes.Items))
for i := range result.Nodes.Items { for i := range result.Nodes.Items {
nodeResult = append(nodeResult, &result.Nodes.Items[i]) nodeResult = append(nodeResult, &result.Nodes.Items[i])
} }
...@@ -127,7 +127,7 @@ func (h *HTTPExtender) Filter(pod *api.Pod, nodes []*api.Node) ([]*api.Node, sch ...@@ -127,7 +127,7 @@ func (h *HTTPExtender) Filter(pod *api.Pod, nodes []*api.Node) ([]*api.Node, sch
// Prioritize based on extender implemented priority functions. Weight*priority is added // 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 // 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. // by Kubernetes scheduler. The total score is used to do the host selection.
func (h *HTTPExtender) Prioritize(pod *api.Pod, nodes []*api.Node) (*schedulerapi.HostPriorityList, int, error) { func (h *HTTPExtender) Prioritize(pod *v1.Pod, nodes []*v1.Node) (*schedulerapi.HostPriorityList, int, error) {
var result schedulerapi.HostPriorityList var result schedulerapi.HostPriorityList
if h.prioritizeVerb == "" { if h.prioritizeVerb == "" {
...@@ -138,13 +138,13 @@ func (h *HTTPExtender) Prioritize(pod *api.Pod, nodes []*api.Node) (*schedulerap ...@@ -138,13 +138,13 @@ func (h *HTTPExtender) Prioritize(pod *api.Pod, nodes []*api.Node) (*schedulerap
return &result, 0, nil return &result, 0, nil
} }
nodeItems := make([]api.Node, 0, len(nodes)) nodeItems := make([]v1.Node, 0, len(nodes))
for _, node := range nodes { for _, node := range nodes {
nodeItems = append(nodeItems, *node) nodeItems = append(nodeItems, *node)
} }
args := schedulerapi.ExtenderArgs{ args := schedulerapi.ExtenderArgs{
Pod: *pod, Pod: *pod,
Nodes: api.NodeList{Items: nodeItems}, Nodes: v1.NodeList{Items: nodeItems},
} }
if err := h.send(h.prioritizeVerb, &args, &result); err != nil { if err := h.send(h.prioritizeVerb, &args, &result); err != nil {
......
plugin/pkg/scheduler/extender_test.go
View file @ f782aba5
...@@ -21,52 +21,52 @@ import ( ...@@ -21,52 +21,52 @@ import (
"testing" "testing"
"time" "time"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
type fitPredicate func(pod *api.Pod, node *api.Node) (bool, error) type fitPredicate func(pod *v1.Pod, node *v1.Node) (bool, error)
type priorityFunc func(pod *api.Pod, nodes []*api.Node) (*schedulerapi.HostPriorityList, error) type priorityFunc func(pod *v1.Pod, nodes []*v1.Node) (*schedulerapi.HostPriorityList, error)
type priorityConfig struct { type priorityConfig struct {
function priorityFunc function priorityFunc
weight int weight int
} }
func errorPredicateExtender(pod *api.Pod, node *api.Node) (bool, error) { func errorPredicateExtender(pod *v1.Pod, node *v1.Node) (bool, error) {
return false, fmt.Errorf("Some error") return false, fmt.Errorf("Some error")
} }
func falsePredicateExtender(pod *api.Pod, node *api.Node) (bool, error) { func falsePredicateExtender(pod *v1.Pod, node *v1.Node) (bool, error) {
return false, nil return false, nil
} }
func truePredicateExtender(pod *api.Pod, node *api.Node) (bool, error) { func truePredicateExtender(pod *v1.Pod, node *v1.Node) (bool, error) {
return true, nil return true, nil
} }
func machine1PredicateExtender(pod *api.Pod, node *api.Node) (bool, error) { func machine1PredicateExtender(pod *v1.Pod, node *v1.Node) (bool, error) {
if node.Name == "machine1" { if node.Name == "machine1" {
return true, nil return true, nil
} }
return false, nil return false, nil
} }
func machine2PredicateExtender(pod *api.Pod, node *api.Node) (bool, error) { func machine2PredicateExtender(pod *v1.Pod, node *v1.Node) (bool, error) {
if node.Name == "machine2" { if node.Name == "machine2" {
return true, nil return true, nil
} }
return false, nil return false, nil
} }
func errorPrioritizerExtender(pod *api.Pod, nodes []*api.Node) (*schedulerapi.HostPriorityList, error) { func errorPrioritizerExtender(pod *v1.Pod, nodes []*v1.Node) (*schedulerapi.HostPriorityList, error) {
return &schedulerapi.HostPriorityList{}, fmt.Errorf("Some error") return &schedulerapi.HostPriorityList{}, fmt.Errorf("Some error")
} }
func machine1PrioritizerExtender(pod *api.Pod, nodes []*api.Node) (*schedulerapi.HostPriorityList, error) { func machine1PrioritizerExtender(pod *v1.Pod, nodes []*v1.Node) (*schedulerapi.HostPriorityList, error) {
result := schedulerapi.HostPriorityList{} result := schedulerapi.HostPriorityList{}
for _, node := range nodes { for _, node := range nodes {
score := 1 score := 1
...@@ -78,7 +78,7 @@ func machine1PrioritizerExtender(pod *api.Pod, nodes []*api.Node) (*schedulerapi ...@@ -78,7 +78,7 @@ func machine1PrioritizerExtender(pod *api.Pod, nodes []*api.Node) (*schedulerapi
return &result, nil return &result, nil
} }
func machine2PrioritizerExtender(pod *api.Pod, nodes []*api.Node) (*schedulerapi.HostPriorityList, error) { func machine2PrioritizerExtender(pod *v1.Pod, nodes []*v1.Node) (*schedulerapi.HostPriorityList, error) {
result := schedulerapi.HostPriorityList{} result := schedulerapi.HostPriorityList{}
for _, node := range nodes { for _, node := range nodes {
score := 1 score := 1
...@@ -90,7 +90,7 @@ func machine2PrioritizerExtender(pod *api.Pod, nodes []*api.Node) (*schedulerapi ...@@ -90,7 +90,7 @@ func machine2PrioritizerExtender(pod *api.Pod, nodes []*api.Node) (*schedulerapi
return &result, nil return &result, nil
} }
func machine2Prioritizer(_ *api.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodes []*api.Node) (schedulerapi.HostPriorityList, error) { func machine2Prioritizer(_ *v1.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodes []*v1.Node) (schedulerapi.HostPriorityList, error) {
result := []schedulerapi.HostPriority{} result := []schedulerapi.HostPriority{}
for _, node := range nodes { for _, node := range nodes {
score := 1 score := 1
...@@ -108,15 +108,15 @@ type FakeExtender struct { ...@@ -108,15 +108,15 @@ type FakeExtender struct {
weight int weight int
} }
func (f *FakeExtender) Filter(pod *api.Pod, nodes []*api.Node) ([]*api.Node, schedulerapi.FailedNodesMap, error) { func (f *FakeExtender) Filter(pod *v1.Pod, nodes []*v1.Node) ([]*v1.Node, schedulerapi.FailedNodesMap, error) {
filtered := []*api.Node{} filtered := []*v1.Node{}
failedNodesMap := schedulerapi.FailedNodesMap{} failedNodesMap := schedulerapi.FailedNodesMap{}
for _, node := range nodes { for _, node := range nodes {
fits := true fits := true
for _, predicate := range f.predicates { for _, predicate := range f.predicates {
fit, err := predicate(pod, node) fit, err := predicate(pod, node)
if err != nil { if err != nil {
return []*api.Node{}, schedulerapi.FailedNodesMap{}, err return []*v1.Node{}, schedulerapi.FailedNodesMap{}, err
} }
if !fit { if !fit {
fits = false fits = false
...@@ -132,7 +132,7 @@ func (f *FakeExtender) Filter(pod *api.Pod, nodes []*api.Node) ([]*api.Node, sch ...@@ -132,7 +132,7 @@ func (f *FakeExtender) Filter(pod *api.Pod, nodes []*api.Node) ([]*api.Node, sch
return filtered, failedNodesMap, nil return filtered, failedNodesMap, nil
} }
func (f *FakeExtender) Prioritize(pod *api.Pod, nodes []*api.Node) (*schedulerapi.HostPriorityList, int, error) { func (f *FakeExtender) Prioritize(pod *v1.Pod, nodes []*v1.Node) (*schedulerapi.HostPriorityList, int, error) {
result := schedulerapi.HostPriorityList{} result := schedulerapi.HostPriorityList{}
combinedScores := map[string]int{} combinedScores := map[string]int{}
for _, prioritizer := range f.prioritizers { for _, prioritizer := range f.prioritizers {
...@@ -164,8 +164,8 @@ func TestGenericSchedulerWithExtenders(t *testing.T) { ...@@ -164,8 +164,8 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
extenderPredicates []fitPredicate extenderPredicates []fitPredicate
extenderPrioritizers []priorityConfig extenderPrioritizers []priorityConfig
nodes []string nodes []string
pod *api.Pod pod *v1.Pod
pods []*api.Pod pods []*v1.Pod
expectedHost string expectedHost string
expectsErr bool expectsErr bool
}{ }{
...@@ -288,7 +288,7 @@ func TestGenericSchedulerWithExtenders(t *testing.T) { ...@@ -288,7 +288,7 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
cache.AddPod(pod) cache.AddPod(pod)
} }
for _, name := range test.nodes { for _, name := range test.nodes {
cache.AddNode(&api.Node{ObjectMeta: api.ObjectMeta{Name: name}}) cache.AddNode(&v1.Node{ObjectMeta: v1.ObjectMeta{Name: name}})
} }
scheduler := NewGenericScheduler( scheduler := NewGenericScheduler(
cache, test.predicates, algorithm.EmptyMetadataProducer, test.prioritizers, algorithm.EmptyMetadataProducer, extenders) cache, test.predicates, algorithm.EmptyMetadataProducer, test.prioritizers, algorithm.EmptyMetadataProducer, extenders)
......
plugin/pkg/scheduler/generic_scheduler.go
View file @ f782aba5
...@@ -26,7 +26,7 @@ import ( ...@@ -26,7 +26,7 @@ import (
"time" "time"
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/errors" "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/util/workqueue" "k8s.io/kubernetes/pkg/util/workqueue"
...@@ -39,7 +39,7 @@ import ( ...@@ -39,7 +39,7 @@ import (
type FailedPredicateMap map[string][]algorithm.PredicateFailureReason type FailedPredicateMap map[string][]algorithm.PredicateFailureReason
type FitError struct { type FitError struct {
Pod *api.Pod Pod *v1.Pod
FailedPredicates FailedPredicateMap FailedPredicates FailedPredicateMap
} }
...@@ -89,7 +89,7 @@ type genericScheduler struct { ...@@ -89,7 +89,7 @@ type genericScheduler struct {
// Schedule tries to schedule the given pod to one of node in the node list. // Schedule tries to schedule the given pod to one of node in the node list.
// If it succeeds, it will return the name of the node. // If it succeeds, it will return the name of the node.
// If it fails, it will return a Fiterror error with reasons. // If it fails, it will return a Fiterror error with reasons.
func (g *genericScheduler) Schedule(pod *api.Pod, nodeLister algorithm.NodeLister) (string, error) { func (g *genericScheduler) Schedule(pod *v1.Pod, nodeLister algorithm.NodeLister) (string, error) {
var trace *util.Trace var trace *util.Trace
if pod != nil { if pod != nil {
trace = util.NewTrace(fmt.Sprintf("Scheduling %s/%s", pod.Namespace, pod.Name)) trace = util.NewTrace(fmt.Sprintf("Scheduling %s/%s", pod.Namespace, pod.Name))
...@@ -160,14 +160,14 @@ func (g *genericScheduler) selectHost(priorityList schedulerapi.HostPriorityList ...@@ -160,14 +160,14 @@ func (g *genericScheduler) selectHost(priorityList schedulerapi.HostPriorityList
// Filters the nodes to find the ones that fit based on the given predicate functions // Filters the nodes to find the ones that fit based on the given predicate functions
// Each node is passed through the predicate functions to determine if it is a fit // Each node is passed through the predicate functions to determine if it is a fit
func findNodesThatFit( func findNodesThatFit(
pod *api.Pod, pod *v1.Pod,
nodeNameToInfo map[string]*schedulercache.NodeInfo, nodeNameToInfo map[string]*schedulercache.NodeInfo,
nodes []*api.Node, nodes []*v1.Node,
predicateFuncs map[string]algorithm.FitPredicate, predicateFuncs map[string]algorithm.FitPredicate,
extenders []algorithm.SchedulerExtender, extenders []algorithm.SchedulerExtender,
metadataProducer algorithm.MetadataProducer, metadataProducer algorithm.MetadataProducer,
) ([]*api.Node, FailedPredicateMap, error) { ) ([]*v1.Node, FailedPredicateMap, error) {
var filtered []*api.Node var filtered []*v1.Node
failedPredicateMap := FailedPredicateMap{} failedPredicateMap := FailedPredicateMap{}
if len(predicateFuncs) == 0 { if len(predicateFuncs) == 0 {
...@@ -175,7 +175,7 @@ func findNodesThatFit( ...@@ -175,7 +175,7 @@ func findNodesThatFit(
} else { } else {
// Create filtered list with enough space to avoid growing it // Create filtered list with enough space to avoid growing it
// and allow assigning. // and allow assigning.
filtered = make([]*api.Node, len(nodes)) filtered = make([]*v1.Node, len(nodes))
errs := []error{} errs := []error{}
var predicateResultLock sync.Mutex var predicateResultLock sync.Mutex
var filteredLen int32 var filteredLen int32
...@@ -202,7 +202,7 @@ func findNodesThatFit( ...@@ -202,7 +202,7 @@ func findNodesThatFit(
workqueue.Parallelize(16, len(nodes), checkNode) workqueue.Parallelize(16, len(nodes), checkNode)
filtered = filtered[:filteredLen] filtered = filtered[:filteredLen]
if len(errs) > 0 { if len(errs) > 0 {
return []*api.Node{}, FailedPredicateMap{}, errors.NewAggregate(errs) return []*v1.Node{}, FailedPredicateMap{}, errors.NewAggregate(errs)
} }
} }
...@@ -210,7 +210,7 @@ func findNodesThatFit( ...@@ -210,7 +210,7 @@ func findNodesThatFit(
for _, extender := range extenders { for _, extender := range extenders {
filteredList, failedMap, err := extender.Filter(pod, filtered) filteredList, failedMap, err := extender.Filter(pod, filtered)
if err != nil { if err != nil {
return []*api.Node{}, FailedPredicateMap{}, err return []*v1.Node{}, FailedPredicateMap{}, err
} }
for failedNodeName, failedMsg := range failedMap { for failedNodeName, failedMsg := range failedMap {
...@@ -229,7 +229,7 @@ func findNodesThatFit( ...@@ -229,7 +229,7 @@ func findNodesThatFit(
} }
// Checks whether node with a given name and NodeInfo satisfies all predicateFuncs. // Checks whether node with a given name and NodeInfo satisfies all predicateFuncs.
func podFitsOnNode(pod *api.Pod, meta interface{}, info *schedulercache.NodeInfo, predicateFuncs map[string]algorithm.FitPredicate) (bool, []algorithm.PredicateFailureReason, error) { func podFitsOnNode(pod *v1.Pod, meta interface{}, info *schedulercache.NodeInfo, predicateFuncs map[string]algorithm.FitPredicate) (bool, []algorithm.PredicateFailureReason, error) {
var failedPredicates []algorithm.PredicateFailureReason var failedPredicates []algorithm.PredicateFailureReason
for _, predicate := range predicateFuncs { for _, predicate := range predicateFuncs {
fit, reasons, err := predicate(pod, meta, info) fit, reasons, err := predicate(pod, meta, info)
...@@ -251,11 +251,11 @@ func podFitsOnNode(pod *api.Pod, meta interface{}, info *schedulercache.NodeInfo ...@@ -251,11 +251,11 @@ func podFitsOnNode(pod *api.Pod, meta interface{}, info *schedulercache.NodeInfo
// The node scores returned by the priority function are multiplied by the weights to get weighted scores // The node scores returned by the priority function are multiplied by the weights to get weighted scores
// All scores are finally combined (added) to get the total weighted scores of all nodes // All scores are finally combined (added) to get the total weighted scores of all nodes
func PrioritizeNodes( func PrioritizeNodes(
pod *api.Pod, pod *v1.Pod,
nodeNameToInfo map[string]*schedulercache.NodeInfo, nodeNameToInfo map[string]*schedulercache.NodeInfo,
meta interface{}, meta interface{},
priorityConfigs []algorithm.PriorityConfig, priorityConfigs []algorithm.PriorityConfig,
nodes []*api.Node, nodes []*v1.Node,
extenders []algorithm.SchedulerExtender, extenders []algorithm.SchedulerExtender,
) (schedulerapi.HostPriorityList, error) { ) (schedulerapi.HostPriorityList, error) {
// If no priority configs are provided, then the EqualPriority function is applied // If no priority configs are provided, then the EqualPriority function is applied
...@@ -381,7 +381,7 @@ func PrioritizeNodes( ...@@ -381,7 +381,7 @@ func PrioritizeNodes(
} }
// EqualPriority is a prioritizer function that gives an equal weight of one to all nodes // EqualPriority is a prioritizer function that gives an equal weight of one to all nodes
func EqualPriorityMap(_ *api.Pod, _ interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) { func EqualPriorityMap(_ *v1.Pod, _ interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) {
node := nodeInfo.Node() node := nodeInfo.Node()
if node == nil { if node == nil {
return schedulerapi.HostPriority{}, fmt.Errorf("node not found") return schedulerapi.HostPriority{}, fmt.Errorf("node not found")
......
plugin/pkg/scheduler/scheduler.go
View file @ f782aba5
...@@ -19,7 +19,7 @@ package scheduler ...@@ -19,7 +19,7 @@ package scheduler
import ( import (
"time" "time"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
...@@ -31,11 +31,11 @@ import ( ...@@ -31,11 +31,11 @@ import (
// Binder knows how to write a binding. // Binder knows how to write a binding.
type Binder interface { type Binder interface {
Bind(binding *api.Binding) error Bind(binding *v1.Binding) error
} }
type PodConditionUpdater interface { type PodConditionUpdater interface {
Update(pod *api.Pod, podCondition *api.PodCondition) error Update(pod *v1.Pod, podCondition *v1.PodCondition) error
} }
// Scheduler watches for new unscheduled pods. It attempts to find // Scheduler watches for new unscheduled pods. It attempts to find
...@@ -60,11 +60,11 @@ type Config struct { ...@@ -60,11 +60,11 @@ type Config struct {
// is available. We don't use a channel for this, because scheduling // is available. We don't use a channel for this, because scheduling
// a pod may take some amount of time and we don't want pods to get // a pod may take some amount of time and we don't want pods to get
// stale while they sit in a channel. // stale while they sit in a channel.
NextPod func() *api.Pod NextPod func() *v1.Pod
// Error is called if there is an error. It is passed the pod in // Error is called if there is an error. It is passed the pod in
// question, and the error // question, and the error
Error func(*api.Pod, error) Error func(*v1.Pod, error)
// Recorder is the EventRecorder to use // Recorder is the EventRecorder to use
Recorder record.EventRecorder Recorder record.EventRecorder
...@@ -96,11 +96,11 @@ func (s *Scheduler) scheduleOne() { ...@@ -96,11 +96,11 @@ func (s *Scheduler) scheduleOne() {
if err != nil { if err != nil {
glog.V(1).Infof("Failed to schedule pod: %v/%v", pod.Namespace, pod.Name) glog.V(1).Infof("Failed to schedule pod: %v/%v", pod.Namespace, pod.Name)
s.config.Error(pod, err) s.config.Error(pod, err)
s.config.Recorder.Eventf(pod, api.EventTypeWarning, "FailedScheduling", "%v", err) s.config.Recorder.Eventf(pod, v1.EventTypeWarning, "FailedScheduling", "%v", err)
s.config.PodConditionUpdater.Update(pod, &api.PodCondition{ s.config.PodConditionUpdater.Update(pod, &v1.PodCondition{
Type: api.PodScheduled, Type: v1.PodScheduled,
Status: api.ConditionFalse, Status: v1.ConditionFalse,
Reason: api.PodReasonUnschedulable, Reason: v1.PodReasonUnschedulable,
}) })
return return
} }
...@@ -126,9 +126,9 @@ func (s *Scheduler) scheduleOne() { ...@@ -126,9 +126,9 @@ func (s *Scheduler) scheduleOne() {
go func() { go func() {
defer metrics.E2eSchedulingLatency.Observe(metrics.SinceInMicroseconds(start)) defer metrics.E2eSchedulingLatency.Observe(metrics.SinceInMicroseconds(start))
b := &api.Binding{ b := &v1.Binding{
ObjectMeta: api.ObjectMeta{Namespace: pod.Namespace, Name: pod.Name}, ObjectMeta: v1.ObjectMeta{Namespace: pod.Namespace, Name: pod.Name},
Target: api.ObjectReference{ Target: v1.ObjectReference{
Kind: "Node", Kind: "Node",
Name: dest, Name: dest,
}, },
...@@ -144,15 +144,15 @@ func (s *Scheduler) scheduleOne() { ...@@ -144,15 +144,15 @@ func (s *Scheduler) scheduleOne() {
glog.Errorf("scheduler cache ForgetPod failed: %v", err) glog.Errorf("scheduler cache ForgetPod failed: %v", err)
} }
s.config.Error(pod, err) s.config.Error(pod, err)
s.config.Recorder.Eventf(pod, api.EventTypeNormal, "FailedScheduling", "Binding rejected: %v", err) s.config.Recorder.Eventf(pod, v1.EventTypeNormal, "FailedScheduling", "Binding rejected: %v", err)
s.config.PodConditionUpdater.Update(pod, &api.PodCondition{ s.config.PodConditionUpdater.Update(pod, &v1.PodCondition{
Type: api.PodScheduled, Type: v1.PodScheduled,
Status: api.ConditionFalse, Status: v1.ConditionFalse,
Reason: "BindingRejected", Reason: "BindingRejected",
}) })
return return
} }
metrics.BindingLatency.Observe(metrics.SinceInMicroseconds(bindingStart)) metrics.BindingLatency.Observe(metrics.SinceInMicroseconds(bindingStart))
s.config.Recorder.Eventf(pod, api.EventTypeNormal, "Scheduled", "Successfully assigned %v to %v", pod.Name, dest) s.config.Recorder.Eventf(pod, v1.EventTypeNormal, "Scheduled", "Successfully assigned %v to %v", pod.Name, dest)
}() }()
} }
plugin/pkg/scheduler/schedulercache/cache.go
View file @ f782aba5
...@@ -22,7 +22,7 @@ import ( ...@@ -22,7 +22,7 @@ import (
"time" "time"
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
) )
...@@ -57,7 +57,7 @@ type schedulerCache struct { ...@@ -57,7 +57,7 @@ type schedulerCache struct {
} }
type podState struct { type podState struct {
pod *api.Pod pod *v1.Pod
// Used by assumedPod to determinate expiration. // Used by assumedPod to determinate expiration.
deadline *time.Time deadline *time.Time
} }
...@@ -90,10 +90,10 @@ func (cache *schedulerCache) UpdateNodeNameToInfoMap(nodeNameToInfo map[string]* ...@@ -90,10 +90,10 @@ func (cache *schedulerCache) UpdateNodeNameToInfoMap(nodeNameToInfo map[string]*
return nil return nil
} }
func (cache *schedulerCache) List(selector labels.Selector) ([]*api.Pod, error) { func (cache *schedulerCache) List(selector labels.Selector) ([]*v1.Pod, error) {
cache.mu.Lock() cache.mu.Lock()
defer cache.mu.Unlock() defer cache.mu.Unlock()
var pods []*api.Pod var pods []*v1.Pod
for _, info := range cache.nodes { for _, info := range cache.nodes {
for _, pod := range info.pods { for _, pod := range info.pods {
if selector.Matches(labels.Set(pod.Labels)) { if selector.Matches(labels.Set(pod.Labels)) {
...@@ -104,12 +104,12 @@ func (cache *schedulerCache) List(selector labels.Selector) ([]*api.Pod, error) ...@@ -104,12 +104,12 @@ func (cache *schedulerCache) List(selector labels.Selector) ([]*api.Pod, error)
return pods, nil return pods, nil
} }
func (cache *schedulerCache) AssumePod(pod *api.Pod) error { func (cache *schedulerCache) AssumePod(pod *v1.Pod) error {
return cache.assumePod(pod, time.Now()) return cache.assumePod(pod, time.Now())
} }
// assumePod exists for making test deterministic by taking time as input argument. // assumePod exists for making test deterministic by taking time as input argument.
func (cache *schedulerCache) assumePod(pod *api.Pod, now time.Time) error { func (cache *schedulerCache) assumePod(pod *v1.Pod, now time.Time) error {
cache.mu.Lock() cache.mu.Lock()
defer cache.mu.Unlock() defer cache.mu.Unlock()
...@@ -132,7 +132,7 @@ func (cache *schedulerCache) assumePod(pod *api.Pod, now time.Time) error { ...@@ -132,7 +132,7 @@ func (cache *schedulerCache) assumePod(pod *api.Pod, now time.Time) error {
return nil return nil
} }
func (cache *schedulerCache) ForgetPod(pod *api.Pod) error { func (cache *schedulerCache) ForgetPod(pod *v1.Pod) error {
key, err := getPodKey(pod) key, err := getPodKey(pod)
if err != nil { if err != nil {
return err return err
...@@ -157,7 +157,7 @@ func (cache *schedulerCache) ForgetPod(pod *api.Pod) error { ...@@ -157,7 +157,7 @@ func (cache *schedulerCache) ForgetPod(pod *api.Pod) error {
return nil return nil
} }
func (cache *schedulerCache) AddPod(pod *api.Pod) error { func (cache *schedulerCache) AddPod(pod *v1.Pod) error {
key, err := getPodKey(pod) key, err := getPodKey(pod)
if err != nil { if err != nil {
return err return err
...@@ -184,7 +184,7 @@ func (cache *schedulerCache) AddPod(pod *api.Pod) error { ...@@ -184,7 +184,7 @@ func (cache *schedulerCache) AddPod(pod *api.Pod) error {
return nil return nil
} }
func (cache *schedulerCache) UpdatePod(oldPod, newPod *api.Pod) error { func (cache *schedulerCache) UpdatePod(oldPod, newPod *v1.Pod) error {
key, err := getPodKey(oldPod) key, err := getPodKey(oldPod)
if err != nil { if err != nil {
return err return err
...@@ -207,7 +207,7 @@ func (cache *schedulerCache) UpdatePod(oldPod, newPod *api.Pod) error { ...@@ -207,7 +207,7 @@ func (cache *schedulerCache) UpdatePod(oldPod, newPod *api.Pod) error {
return nil return nil
} }
func (cache *schedulerCache) updatePod(oldPod, newPod *api.Pod) error { func (cache *schedulerCache) updatePod(oldPod, newPod *v1.Pod) error {
if err := cache.removePod(oldPod); err != nil { if err := cache.removePod(oldPod); err != nil {
return err return err
} }
...@@ -215,7 +215,7 @@ func (cache *schedulerCache) updatePod(oldPod, newPod *api.Pod) error { ...@@ -215,7 +215,7 @@ func (cache *schedulerCache) updatePod(oldPod, newPod *api.Pod) error {
return nil return nil
} }
func (cache *schedulerCache) addPod(pod *api.Pod) { func (cache *schedulerCache) addPod(pod *v1.Pod) {
n, ok := cache.nodes[pod.Spec.NodeName] n, ok := cache.nodes[pod.Spec.NodeName]
if !ok { if !ok {
n = NewNodeInfo() n = NewNodeInfo()
...@@ -224,7 +224,7 @@ func (cache *schedulerCache) addPod(pod *api.Pod) { ...@@ -224,7 +224,7 @@ func (cache *schedulerCache) addPod(pod *api.Pod) {
n.addPod(pod) n.addPod(pod)
} }
func (cache *schedulerCache) removePod(pod *api.Pod) error { func (cache *schedulerCache) removePod(pod *v1.Pod) error {
n := cache.nodes[pod.Spec.NodeName] n := cache.nodes[pod.Spec.NodeName]
if err := n.removePod(pod); err != nil { if err := n.removePod(pod); err != nil {
return err return err
...@@ -235,7 +235,7 @@ func (cache *schedulerCache) removePod(pod *api.Pod) error { ...@@ -235,7 +235,7 @@ func (cache *schedulerCache) removePod(pod *api.Pod) error {
return nil return nil
} }
func (cache *schedulerCache) RemovePod(pod *api.Pod) error { func (cache *schedulerCache) RemovePod(pod *v1.Pod) error {
key, err := getPodKey(pod) key, err := getPodKey(pod)
if err != nil { if err != nil {
return err return err
...@@ -260,7 +260,7 @@ func (cache *schedulerCache) RemovePod(pod *api.Pod) error { ...@@ -260,7 +260,7 @@ func (cache *schedulerCache) RemovePod(pod *api.Pod) error {
return nil return nil
} }
func (cache *schedulerCache) AddNode(node *api.Node) error { func (cache *schedulerCache) AddNode(node *v1.Node) error {
cache.mu.Lock() cache.mu.Lock()
defer cache.mu.Unlock() defer cache.mu.Unlock()
...@@ -272,7 +272,7 @@ func (cache *schedulerCache) AddNode(node *api.Node) error { ...@@ -272,7 +272,7 @@ func (cache *schedulerCache) AddNode(node *api.Node) error {
return n.SetNode(node) return n.SetNode(node)
} }
func (cache *schedulerCache) UpdateNode(oldNode, newNode *api.Node) error { func (cache *schedulerCache) UpdateNode(oldNode, newNode *v1.Node) error {
cache.mu.Lock() cache.mu.Lock()
defer cache.mu.Unlock() defer cache.mu.Unlock()
...@@ -284,7 +284,7 @@ func (cache *schedulerCache) UpdateNode(oldNode, newNode *api.Node) error { ...@@ -284,7 +284,7 @@ func (cache *schedulerCache) UpdateNode(oldNode, newNode *api.Node) error {
return n.SetNode(newNode) return n.SetNode(newNode)
} }
func (cache *schedulerCache) RemoveNode(node *api.Node) error { func (cache *schedulerCache) RemoveNode(node *v1.Node) error {
cache.mu.Lock() cache.mu.Lock()
defer cache.mu.Unlock() defer cache.mu.Unlock()
......
plugin/pkg/scheduler/schedulercache/interface.go
View file @ f782aba5
...@@ -17,7 +17,7 @@ limitations under the License. ...@@ -17,7 +17,7 @@ limitations under the License.
package schedulercache package schedulercache
import ( import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
) )
...@@ -59,29 +59,29 @@ type Cache interface { ...@@ -59,29 +59,29 @@ type Cache interface {
// AssumePod assumes a pod scheduled and aggregates the pod's information into its node. // AssumePod assumes a pod scheduled and aggregates the pod's information into its node.
// The implementation also decides the policy to expire pod before being confirmed (receiving Add event). // The implementation also decides the policy to expire pod before being confirmed (receiving Add event).
// After expiration, its information would be subtracted. // After expiration, its information would be subtracted.
AssumePod(pod *api.Pod) error AssumePod(pod *v1.Pod) error
// ForgetPod removes an assumed pod from cache. // ForgetPod removes an assumed pod from cache.
ForgetPod(pod *api.Pod) error ForgetPod(pod *v1.Pod) error
// AddPod either confirms a pod if it's assumed, or adds it back if it's expired. // AddPod either confirms a pod if it's assumed, or adds it back if it's expired.
// If added back, the pod's information would be added again. // If added back, the pod's information would be added again.
AddPod(pod *api.Pod) error AddPod(pod *v1.Pod) error
// UpdatePod removes oldPod's information and adds newPod's information. // UpdatePod removes oldPod's information and adds newPod's information.
UpdatePod(oldPod, newPod *api.Pod) error UpdatePod(oldPod, newPod *v1.Pod) error
// RemovePod removes a pod. The pod's information would be subtracted from assigned node. // RemovePod removes a pod. The pod's information would be subtracted from assigned node.
RemovePod(pod *api.Pod) error RemovePod(pod *v1.Pod) error
// AddNode adds overall information about node. // AddNode adds overall information about node.
AddNode(node *api.Node) error AddNode(node *v1.Node) error
// UpdateNode updates overall information about node. // UpdateNode updates overall information about node.
UpdateNode(oldNode, newNode *api.Node) error UpdateNode(oldNode, newNode *v1.Node) error
// RemoveNode removes overall information about node. // RemoveNode removes overall information about node.
RemoveNode(node *api.Node) error RemoveNode(node *v1.Node) error
// UpdateNodeNameToInfoMap updates the passed infoMap to the current contents of Cache. // UpdateNodeNameToInfoMap updates the passed infoMap to the current contents of Cache.
// The node info contains aggregated information of pods scheduled (including assumed to be) // The node info contains aggregated information of pods scheduled (including assumed to be)
...@@ -89,5 +89,5 @@ type Cache interface { ...@@ -89,5 +89,5 @@ type Cache interface {
UpdateNodeNameToInfoMap(infoMap map[string]*NodeInfo) error UpdateNodeNameToInfoMap(infoMap map[string]*NodeInfo) error
// List lists all cached pods (including assumed ones). // List lists all cached pods (including assumed ones).
List(labels.Selector) ([]*api.Pod, error) List(labels.Selector) ([]*v1.Pod, error)
} }
plugin/pkg/scheduler/schedulercache/node_info.go
View file @ f782aba5
...@@ -21,8 +21,8 @@ import ( ...@@ -21,8 +21,8 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
clientcache "k8s.io/kubernetes/pkg/client/cache" clientcache "k8s.io/kubernetes/pkg/client/cache"
priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util"
) )
...@@ -32,10 +32,10 @@ var emptyResource = Resource{} ...@@ -32,10 +32,10 @@ var emptyResource = Resource{}
// NodeInfo is node level aggregated information. // NodeInfo is node level aggregated information.
type NodeInfo struct { type NodeInfo struct {
// Overall node information. // Overall node information.
node *api.Node node *v1.Node
pods []*api.Pod pods []*v1.Pod
podsWithAffinity []*api.Pod podsWithAffinity []*v1.Pod
// Total requested resource of all pods on this node. // Total requested resource of all pods on this node.
// It includes assumed pods which scheduler sends binding to apiserver but // It includes assumed pods which scheduler sends binding to apiserver but
...@@ -59,14 +59,14 @@ type Resource struct { ...@@ -59,14 +59,14 @@ type Resource struct {
MilliCPU int64 MilliCPU int64
Memory int64 Memory int64
NvidiaGPU int64 NvidiaGPU int64
OpaqueIntResources map[api.ResourceName]int64 OpaqueIntResources map[v1.ResourceName]int64
} }
func (r *Resource) ResourceList() api.ResourceList { func (r *Resource) ResourceList() v1.ResourceList {
result := api.ResourceList{ result := v1.ResourceList{
api.ResourceCPU: *resource.NewMilliQuantity(r.MilliCPU, resource.DecimalSI), v1.ResourceCPU: *resource.NewMilliQuantity(r.MilliCPU, resource.DecimalSI),
api.ResourceMemory: *resource.NewQuantity(r.Memory, resource.BinarySI), v1.ResourceMemory: *resource.NewQuantity(r.Memory, resource.BinarySI),
api.ResourceNvidiaGPU: *resource.NewQuantity(r.NvidiaGPU, resource.DecimalSI), v1.ResourceNvidiaGPU: *resource.NewQuantity(r.NvidiaGPU, resource.DecimalSI),
} }
for rName, rQuant := range r.OpaqueIntResources { for rName, rQuant := range r.OpaqueIntResources {
result[rName] = *resource.NewQuantity(rQuant, resource.DecimalSI) result[rName] = *resource.NewQuantity(rQuant, resource.DecimalSI)
...@@ -77,7 +77,7 @@ func (r *Resource) ResourceList() api.ResourceList { ...@@ -77,7 +77,7 @@ func (r *Resource) ResourceList() api.ResourceList {
// NewNodeInfo returns a ready to use empty NodeInfo object. // NewNodeInfo returns a ready to use empty NodeInfo object.
// If any pods are given in arguments, their information will be aggregated in // If any pods are given in arguments, their information will be aggregated in
// the returned object. // the returned object.
func NewNodeInfo(pods ...*api.Pod) *NodeInfo { func NewNodeInfo(pods ...*v1.Pod) *NodeInfo {
ni := &NodeInfo{ ni := &NodeInfo{
requestedResource: &Resource{}, requestedResource: &Resource{},
nonzeroRequest: &Resource{}, nonzeroRequest: &Resource{},
...@@ -92,7 +92,7 @@ func NewNodeInfo(pods ...*api.Pod) *NodeInfo { ...@@ -92,7 +92,7 @@ func NewNodeInfo(pods ...*api.Pod) *NodeInfo {
} }
// Returns overall information about this node. // Returns overall information about this node.
func (n *NodeInfo) Node() *api.Node { func (n *NodeInfo) Node() *v1.Node {
if n == nil { if n == nil {
return nil return nil
} }
...@@ -100,7 +100,7 @@ func (n *NodeInfo) Node() *api.Node { ...@@ -100,7 +100,7 @@ func (n *NodeInfo) Node() *api.Node {
} }
// Pods return all pods scheduled (including assumed to be) on this node. // Pods return all pods scheduled (including assumed to be) on this node.
func (n *NodeInfo) Pods() []*api.Pod { func (n *NodeInfo) Pods() []*v1.Pod {
if n == nil { if n == nil {
return nil return nil
} }
...@@ -108,7 +108,7 @@ func (n *NodeInfo) Pods() []*api.Pod { ...@@ -108,7 +108,7 @@ func (n *NodeInfo) Pods() []*api.Pod {
} }
// PodsWithAffinity return all pods with (anti)affinity constraints on this node. // PodsWithAffinity return all pods with (anti)affinity constraints on this node.
func (n *NodeInfo) PodsWithAffinity() []*api.Pod { func (n *NodeInfo) PodsWithAffinity() []*v1.Pod {
if n == nil { if n == nil {
return nil return nil
} }
...@@ -156,10 +156,10 @@ func (n *NodeInfo) Clone() *NodeInfo { ...@@ -156,10 +156,10 @@ func (n *NodeInfo) Clone() *NodeInfo {
generation: n.generation, generation: n.generation,
} }
if len(n.pods) > 0 { if len(n.pods) > 0 {
clone.pods = append([]*api.Pod(nil), n.pods...) clone.pods = append([]*v1.Pod(nil), n.pods...)
} }
if len(n.podsWithAffinity) > 0 { if len(n.podsWithAffinity) > 0 {
clone.podsWithAffinity = append([]*api.Pod(nil), n.podsWithAffinity...) clone.podsWithAffinity = append([]*v1.Pod(nil), n.podsWithAffinity...)
} }
return clone return clone
} }
...@@ -173,8 +173,8 @@ func (n *NodeInfo) String() string { ...@@ -173,8 +173,8 @@ func (n *NodeInfo) String() string {
return fmt.Sprintf("&NodeInfo{Pods:%v, RequestedResource:%#v, NonZeroRequest: %#v}", podKeys, n.requestedResource, n.nonzeroRequest) return fmt.Sprintf("&NodeInfo{Pods:%v, RequestedResource:%#v, NonZeroRequest: %#v}", podKeys, n.requestedResource, n.nonzeroRequest)
} }
func hasPodAffinityConstraints(pod *api.Pod) bool { func hasPodAffinityConstraints(pod *v1.Pod) bool {
affinity, err := api.GetAffinityFromPodAnnotations(pod.Annotations) affinity, err := v1.GetAffinityFromPodAnnotations(pod.Annotations)
if err != nil || affinity == nil { if err != nil || affinity == nil {
return false return false
} }
...@@ -182,14 +182,14 @@ func hasPodAffinityConstraints(pod *api.Pod) bool { ...@@ -182,14 +182,14 @@ func hasPodAffinityConstraints(pod *api.Pod) bool {
} }
// addPod adds pod information to this NodeInfo. // addPod adds pod information to this NodeInfo.
func (n *NodeInfo) addPod(pod *api.Pod) { func (n *NodeInfo) addPod(pod *v1.Pod) {
// cpu, mem, nvidia_gpu, non0_cpu, non0_mem := calculateResource(pod) // cpu, mem, nvidia_gpu, non0_cpu, non0_mem := calculateResource(pod)
res, non0_cpu, non0_mem := calculateResource(pod) res, non0_cpu, non0_mem := calculateResource(pod)
n.requestedResource.MilliCPU += res.MilliCPU n.requestedResource.MilliCPU += res.MilliCPU
n.requestedResource.Memory += res.Memory n.requestedResource.Memory += res.Memory
n.requestedResource.NvidiaGPU += res.NvidiaGPU n.requestedResource.NvidiaGPU += res.NvidiaGPU
if n.requestedResource.OpaqueIntResources == nil && len(res.OpaqueIntResources) > 0 { if n.requestedResource.OpaqueIntResources == nil && len(res.OpaqueIntResources) > 0 {
n.requestedResource.OpaqueIntResources = map[api.ResourceName]int64{} n.requestedResource.OpaqueIntResources = map[v1.ResourceName]int64{}
} }
for rName, rQuant := range res.OpaqueIntResources { for rName, rQuant := range res.OpaqueIntResources {
n.requestedResource.OpaqueIntResources[rName] += rQuant n.requestedResource.OpaqueIntResources[rName] += rQuant
...@@ -204,7 +204,7 @@ func (n *NodeInfo) addPod(pod *api.Pod) { ...@@ -204,7 +204,7 @@ func (n *NodeInfo) addPod(pod *api.Pod) {
} }
// removePod subtracts pod information to this NodeInfo. // removePod subtracts pod information to this NodeInfo.
func (n *NodeInfo) removePod(pod *api.Pod) error { func (n *NodeInfo) removePod(pod *v1.Pod) error {
k1, err := getPodKey(pod) k1, err := getPodKey(pod)
if err != nil { if err != nil {
return err return err
...@@ -240,7 +240,7 @@ func (n *NodeInfo) removePod(pod *api.Pod) error { ...@@ -240,7 +240,7 @@ func (n *NodeInfo) removePod(pod *api.Pod) error {
n.requestedResource.Memory -= res.Memory n.requestedResource.Memory -= res.Memory
n.requestedResource.NvidiaGPU -= res.NvidiaGPU n.requestedResource.NvidiaGPU -= res.NvidiaGPU
if len(res.OpaqueIntResources) > 0 && n.requestedResource.OpaqueIntResources == nil { if len(res.OpaqueIntResources) > 0 && n.requestedResource.OpaqueIntResources == nil {
n.requestedResource.OpaqueIntResources = map[api.ResourceName]int64{} n.requestedResource.OpaqueIntResources = map[v1.ResourceName]int64{}
} }
for rName, rQuant := range res.OpaqueIntResources { for rName, rQuant := range res.OpaqueIntResources {
n.requestedResource.OpaqueIntResources[rName] -= rQuant n.requestedResource.OpaqueIntResources[rName] -= rQuant
...@@ -254,21 +254,21 @@ func (n *NodeInfo) removePod(pod *api.Pod) error { ...@@ -254,21 +254,21 @@ func (n *NodeInfo) removePod(pod *api.Pod) error {
return fmt.Errorf("no corresponding pod %s in pods of node %s", pod.Name, n.node.Name) return fmt.Errorf("no corresponding pod %s in pods of node %s", pod.Name, n.node.Name)
} }
func calculateResource(pod *api.Pod) (res Resource, non0_cpu int64, non0_mem int64) { func calculateResource(pod *v1.Pod) (res Resource, non0_cpu int64, non0_mem int64) {
for _, c := range pod.Spec.Containers { for _, c := range pod.Spec.Containers {
for rName, rQuant := range c.Resources.Requests { for rName, rQuant := range c.Resources.Requests {
switch rName { switch rName {
case api.ResourceCPU: case v1.ResourceCPU:
res.MilliCPU += rQuant.MilliValue() res.MilliCPU += rQuant.MilliValue()
case api.ResourceMemory: case v1.ResourceMemory:
res.Memory += rQuant.Value() res.Memory += rQuant.Value()
case api.ResourceNvidiaGPU: case v1.ResourceNvidiaGPU:
res.NvidiaGPU += rQuant.Value() res.NvidiaGPU += rQuant.Value()
default: default:
if api.IsOpaqueIntResourceName(rName) { if v1.IsOpaqueIntResourceName(rName) {
// Lazily allocate opaque resource map. // Lazily allocate opaque resource map.
if res.OpaqueIntResources == nil { if res.OpaqueIntResources == nil {
res.OpaqueIntResources = map[api.ResourceName]int64{} res.OpaqueIntResources = map[v1.ResourceName]int64{}
} }
res.OpaqueIntResources[rName] += rQuant.Value() res.OpaqueIntResources[rName] += rQuant.Value()
} }
...@@ -284,23 +284,23 @@ func calculateResource(pod *api.Pod) (res Resource, non0_cpu int64, non0_mem int ...@@ -284,23 +284,23 @@ func calculateResource(pod *api.Pod) (res Resource, non0_cpu int64, non0_mem int
} }
// Sets the overall node information. // Sets the overall node information.
func (n *NodeInfo) SetNode(node *api.Node) error { func (n *NodeInfo) SetNode(node *v1.Node) error {
n.node = node n.node = node
for rName, rQuant := range node.Status.Allocatable { for rName, rQuant := range node.Status.Allocatable {
switch rName { switch rName {
case api.ResourceCPU: case v1.ResourceCPU:
n.allocatableResource.MilliCPU = rQuant.MilliValue() n.allocatableResource.MilliCPU = rQuant.MilliValue()
case api.ResourceMemory: case v1.ResourceMemory:
n.allocatableResource.Memory = rQuant.Value() n.allocatableResource.Memory = rQuant.Value()
case api.ResourceNvidiaGPU: case v1.ResourceNvidiaGPU:
n.allocatableResource.NvidiaGPU = rQuant.Value() n.allocatableResource.NvidiaGPU = rQuant.Value()
case api.ResourcePods: case v1.ResourcePods:
n.allowedPodNumber = int(rQuant.Value()) n.allowedPodNumber = int(rQuant.Value())
default: default:
if api.IsOpaqueIntResourceName(rName) { if v1.IsOpaqueIntResourceName(rName) {
// Lazily allocate opaque resource map. // Lazily allocate opaque resource map.
if n.allocatableResource.OpaqueIntResources == nil { if n.allocatableResource.OpaqueIntResources == nil {
n.allocatableResource.OpaqueIntResources = map[api.ResourceName]int64{} n.allocatableResource.OpaqueIntResources = map[v1.ResourceName]int64{}
} }
n.allocatableResource.OpaqueIntResources[rName] = rQuant.Value() n.allocatableResource.OpaqueIntResources[rName] = rQuant.Value()
} }
...@@ -311,7 +311,7 @@ func (n *NodeInfo) SetNode(node *api.Node) error { ...@@ -311,7 +311,7 @@ func (n *NodeInfo) SetNode(node *api.Node) error {
} }
// Removes the overall information about the node. // Removes the overall information about the node.
func (n *NodeInfo) RemoveNode(node *api.Node) error { func (n *NodeInfo) RemoveNode(node *v1.Node) error {
// We don't remove NodeInfo for because there can still be some pods on this node - // We don't remove NodeInfo for because there can still be some pods on this node -
// this is because notifications about pods are delivered in a different watch, // this is because notifications about pods are delivered in a different watch,
// and thus can potentially be observed later, even though they happened before // and thus can potentially be observed later, even though they happened before
...@@ -324,6 +324,6 @@ func (n *NodeInfo) RemoveNode(node *api.Node) error { ...@@ -324,6 +324,6 @@ func (n *NodeInfo) RemoveNode(node *api.Node) error {
} }
// getPodKey returns the string key of a pod. // getPodKey returns the string key of a pod.
func getPodKey(pod *api.Pod) (string, error) { func getPodKey(pod *v1.Pod) (string, error) {
return clientcache.MetaNamespaceKeyFunc(pod) return clientcache.MetaNamespaceKeyFunc(pod)
} }
plugin/pkg/scheduler/schedulercache/util.go
View file @ f782aba5
...@@ -16,11 +16,11 @@ limitations under the License. ...@@ -16,11 +16,11 @@ limitations under the License.
package schedulercache package schedulercache
import "k8s.io/kubernetes/pkg/api" import "k8s.io/kubernetes/pkg/api/v1"
// CreateNodeNameToInfoMap obtains a list of pods and pivots that list into a map where the keys are node names // CreateNodeNameToInfoMap obtains a list of pods and pivots that list into a map where the keys are node names
// and the values are the aggregated information for that node. // and the values are the aggregated information for that node.
func CreateNodeNameToInfoMap(pods []*api.Pod, nodes []*api.Node) map[string]*NodeInfo { func CreateNodeNameToInfoMap(pods []*v1.Pod, nodes []*v1.Node) map[string]*NodeInfo {
nodeNameToInfo := make(map[string]*NodeInfo) nodeNameToInfo := make(map[string]*NodeInfo)
for _, pod := range pods { for _, pod := range pods {
nodeName := pod.Spec.NodeName nodeName := pod.Spec.NodeName
......
plugin/pkg/scheduler/testing/fake_cache.go
View file @ f782aba5
...@@ -17,37 +17,37 @@ limitations under the License. ...@@ -17,37 +17,37 @@ limitations under the License.
package schedulercache package schedulercache
import ( import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
// FakeCache is used for testing // FakeCache is used for testing
type FakeCache struct { type FakeCache struct {
AssumeFunc func(*api.Pod) AssumeFunc func(*v1.Pod)
} }
func (f *FakeCache) AssumePod(pod *api.Pod) error { func (f *FakeCache) AssumePod(pod *v1.Pod) error {
f.AssumeFunc(pod) f.AssumeFunc(pod)
return nil return nil
} }
func (f *FakeCache) ForgetPod(pod *api.Pod) error { return nil } func (f *FakeCache) ForgetPod(pod *v1.Pod) error { return nil }
func (f *FakeCache) AddPod(pod *api.Pod) error { return nil } func (f *FakeCache) AddPod(pod *v1.Pod) error { return nil }
func (f *FakeCache) UpdatePod(oldPod, newPod *api.Pod) error { return nil } func (f *FakeCache) UpdatePod(oldPod, newPod *v1.Pod) error { return nil }
func (f *FakeCache) RemovePod(pod *api.Pod) error { return nil } func (f *FakeCache) RemovePod(pod *v1.Pod) error { return nil }
func (f *FakeCache) AddNode(node *api.Node) error { return nil } func (f *FakeCache) AddNode(node *v1.Node) error { return nil }
func (f *FakeCache) UpdateNode(oldNode, newNode *api.Node) error { return nil } func (f *FakeCache) UpdateNode(oldNode, newNode *v1.Node) error { return nil }
func (f *FakeCache) RemoveNode(node *api.Node) error { return nil } func (f *FakeCache) RemoveNode(node *v1.Node) error { return nil }
func (f *FakeCache) UpdateNodeNameToInfoMap(infoMap map[string]*schedulercache.NodeInfo) error { func (f *FakeCache) UpdateNodeNameToInfoMap(infoMap map[string]*schedulercache.NodeInfo) error {
return nil return nil
} }
func (f *FakeCache) List(s labels.Selector) ([]*api.Pod, error) { return nil, nil } func (f *FakeCache) List(s labels.Selector) ([]*v1.Pod, error) { return nil, nil }
plugin/pkg/scheduler/testing/pods_to_cache.go
View file @ f782aba5
...@@ -17,35 +17,35 @@ limitations under the License. ...@@ -17,35 +17,35 @@ limitations under the License.
package schedulercache package schedulercache
import ( import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
) )
// PodsToCache is used for testing // PodsToCache is used for testing
type PodsToCache []*api.Pod type PodsToCache []*v1.Pod
func (p PodsToCache) AssumePod(pod *api.Pod) error { return nil } func (p PodsToCache) AssumePod(pod *v1.Pod) error { return nil }
func (p PodsToCache) ForgetPod(pod *api.Pod) error { return nil } func (p PodsToCache) ForgetPod(pod *v1.Pod) error { return nil }
func (p PodsToCache) AddPod(pod *api.Pod) error { return nil } func (p PodsToCache) AddPod(pod *v1.Pod) error { return nil }
func (p PodsToCache) UpdatePod(oldPod, newPod *api.Pod) error { return nil } func (p PodsToCache) UpdatePod(oldPod, newPod *v1.Pod) error { return nil }
func (p PodsToCache) RemovePod(pod *api.Pod) error { return nil } func (p PodsToCache) RemovePod(pod *v1.Pod) error { return nil }
func (p PodsToCache) AddNode(node *api.Node) error { return nil } func (p PodsToCache) AddNode(node *v1.Node) error { return nil }
func (p PodsToCache) UpdateNode(oldNode, newNode *api.Node) error { return nil } func (p PodsToCache) UpdateNode(oldNode, newNode *v1.Node) error { return nil }
func (p PodsToCache) RemoveNode(node *api.Node) error { return nil } func (p PodsToCache) RemoveNode(node *v1.Node) error { return nil }
func (p PodsToCache) UpdateNodeNameToInfoMap(infoMap map[string]*schedulercache.NodeInfo) error { func (p PodsToCache) UpdateNodeNameToInfoMap(infoMap map[string]*schedulercache.NodeInfo) error {
return nil return nil
} }
func (p PodsToCache) List(s labels.Selector) (selected []*api.Pod, err error) { func (p PodsToCache) List(s labels.Selector) (selected []*v1.Pod, err error) {
for _, pod := range p { for _, pod := range p {
if s.Matches(labels.Set(pod.Labels)) { if s.Matches(labels.Set(pod.Labels)) {
selected = append(selected, pod) selected = append(selected, pod)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment