mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 07:47:56 +00:00
Remove NodeLister from Scheduler Configurator
Signed-off-by: Aldo Culquicondor <acondor@google.com>
This commit is contained in:
parent
feb40b844c
commit
8e9af0185d
@ -153,8 +153,6 @@ type Configurator interface {
|
|||||||
GetClient() clientset.Interface
|
GetClient() clientset.Interface
|
||||||
|
|
||||||
// TODO(#80216): Remove these methods from the interface.
|
// TODO(#80216): Remove these methods from the interface.
|
||||||
// Needs to be exposed for things like integration tests where we want to make fake nodes.
|
|
||||||
GetNodeLister() corelisters.NodeLister
|
|
||||||
// Exposed for testing
|
// Exposed for testing
|
||||||
GetScheduledPodLister() corelisters.PodLister
|
GetScheduledPodLister() corelisters.PodLister
|
||||||
|
|
||||||
@ -170,8 +168,6 @@ type configFactory struct {
|
|||||||
client clientset.Interface
|
client clientset.Interface
|
||||||
// a means to list all known scheduled pods.
|
// a means to list all known scheduled pods.
|
||||||
scheduledPodLister corelisters.PodLister
|
scheduledPodLister corelisters.PodLister
|
||||||
// a means to list all nodes
|
|
||||||
nodeLister corelisters.NodeLister
|
|
||||||
// a means to list all PersistentVolumes
|
// a means to list all PersistentVolumes
|
||||||
pVLister corelisters.PersistentVolumeLister
|
pVLister corelisters.PersistentVolumeLister
|
||||||
// a means to list all PersistentVolumeClaims
|
// a means to list all PersistentVolumeClaims
|
||||||
@ -281,7 +277,6 @@ func NewConfigFactory(args *ConfigFactoryArgs) Configurator {
|
|||||||
c := &configFactory{
|
c := &configFactory{
|
||||||
client: args.Client,
|
client: args.Client,
|
||||||
podQueue: internalqueue.NewSchedulingQueue(stopEverything, framework),
|
podQueue: internalqueue.NewSchedulingQueue(stopEverything, framework),
|
||||||
nodeLister: args.NodeInformer.Lister(),
|
|
||||||
pVLister: args.PvInformer.Lister(),
|
pVLister: args.PvInformer.Lister(),
|
||||||
pVCLister: args.PvcInformer.Lister(),
|
pVCLister: args.PvcInformer.Lister(),
|
||||||
serviceLister: args.ServiceInformer.Lister(),
|
serviceLister: args.ServiceInformer.Lister(),
|
||||||
@ -324,11 +319,6 @@ func NewConfigFactory(args *ConfigFactoryArgs) Configurator {
|
|||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetNodeStore provides the cache to the nodes, mostly internal use, but may also be called by mock-tests.
|
|
||||||
func (c *configFactory) GetNodeLister() corelisters.NodeLister {
|
|
||||||
return c.nodeLister
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *configFactory) GetHardPodAffinitySymmetricWeight() int32 {
|
func (c *configFactory) GetHardPodAffinitySymmetricWeight() int32 {
|
||||||
return c.hardPodAffinitySymmetricWeight
|
return c.hardPodAffinitySymmetricWeight
|
||||||
}
|
}
|
||||||
|
@ -56,11 +56,6 @@ func (fc *FakeConfigurator) MakeDefaultErrorFunc(backoff *internalqueue.PodBacko
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetNodeLister is not implemented yet.
|
|
||||||
func (fc *FakeConfigurator) GetNodeLister() corelisters.NodeLister {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetClient is not implemented yet.
|
// GetClient is not implemented yet.
|
||||||
func (fc *FakeConfigurator) GetClient() clientset.Interface {
|
func (fc *FakeConfigurator) GetClient() clientset.Interface {
|
||||||
return nil
|
return nil
|
||||||
|
@ -354,7 +354,7 @@ func TestUnschedulableNodes(t *testing.T) {
|
|||||||
context := initTest(t, "unschedulable-nodes")
|
context := initTest(t, "unschedulable-nodes")
|
||||||
defer cleanupTest(t, context)
|
defer cleanupTest(t, context)
|
||||||
|
|
||||||
nodeLister := context.schedulerConfigFactory.GetNodeLister()
|
nodeLister := context.schedulerConfig.NodeLister
|
||||||
// NOTE: This test cannot run in parallel, because it is creating and deleting
|
// NOTE: This test cannot run in parallel, because it is creating and deleting
|
||||||
// non-namespaced objects (Nodes).
|
// non-namespaced objects (Nodes).
|
||||||
defer context.clientSet.CoreV1().Nodes().DeleteCollection(nil, metav1.ListOptions{})
|
defer context.clientSet.CoreV1().Nodes().DeleteCollection(nil, metav1.ListOptions{})
|
||||||
|
Loading…
Reference in New Issue
Block a user