github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #91175 from Huang-Wei/volume-binding-leftover

Browse Source 
Cleanup volume binding leftover
This commit is contained in:
Kubernetes Prow Robot 2020-05-20 19:41:10 -07:00 committed by GitHub
commit f7a6e9e2f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/scheduler/framework/v1alpha1/BUILD
View File

@ -17,7 +17,6 @@ go_library(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
"//pkg/apis/core/v1/helper:go_default_library", "//pkg/apis/core/v1/helper:go_default_library",
"//pkg/controller/volume/scheduling:go_default_library",
"//pkg/features:go_default_library", "//pkg/features:go_default_library",
"//pkg/scheduler/apis/config:go_default_library", "//pkg/scheduler/apis/config:go_default_library",
"//pkg/scheduler/apis/config/scheme:go_default_library", "//pkg/scheduler/apis/config/scheme:go_default_library",

16
pkg/scheduler/framework/v1alpha1/framework.go
View File

@ -30,7 +30,6 @@ import (
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/kube-scheduler/config/v1alpha2" "k8s.io/kube-scheduler/config/v1alpha2"
"k8s.io/kubernetes/pkg/controller/volume/scheduling"
"k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/apis/config/scheme" "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme"
"k8s.io/kubernetes/pkg/scheduler/internal/parallelize" "k8s.io/kubernetes/pkg/scheduler/internal/parallelize"
@ -79,7 +78,6 @@ type framework struct {
clientSet clientset.Interface clientSet clientset.Interface
informerFactory informers.SharedInformerFactory informerFactory informers.SharedInformerFactory
volumeBinder scheduling.SchedulerVolumeBinder
metricsRecorder *metricsRecorder metricsRecorder *metricsRecorder
@ -122,7 +120,6 @@ type frameworkOptions struct {
informerFactory informers.SharedInformerFactory informerFactory informers.SharedInformerFactory
snapshotSharedLister SharedLister snapshotSharedLister SharedLister
metricsRecorder *metricsRecorder metricsRecorder *metricsRecorder
volumeBinder scheduling.SchedulerVolumeBinder
podNominator PodNominator podNominator PodNominator
runAllFilters bool runAllFilters bool
} }
@ -166,13 +163,6 @@ func withMetricsRecorder(recorder *metricsRecorder) Option {
} }
} }
// WithVolumeBinder sets volume binder for the scheduling framework.
func WithVolumeBinder(binder scheduling.SchedulerVolumeBinder) Option {
return func(o *frameworkOptions) {
o.volumeBinder = binder
}
}
// WithPodNominator sets podNominator for the scheduling framework. // WithPodNominator sets podNominator for the scheduling framework.
func WithPodNominator(nominator PodNominator) Option { func WithPodNominator(nominator PodNominator) Option {
return func(o *frameworkOptions) { return func(o *frameworkOptions) {
@ -200,7 +190,6 @@ func NewFramework(r Registry, plugins *config.Plugins, args []config.PluginConfi
waitingPods: newWaitingPodsMap(), waitingPods: newWaitingPodsMap(),
clientSet: options.clientSet, clientSet: options.clientSet,
informerFactory: options.informerFactory, informerFactory: options.informerFactory,
volumeBinder: options.volumeBinder,
metricsRecorder: options.metricsRecorder, metricsRecorder: options.metricsRecorder,
preemptHandle: options.podNominator, preemptHandle: options.podNominator,
runAllFilters: options.runAllFilters, runAllFilters: options.runAllFilters,
@ -922,11 +911,6 @@ func (f *framework) SharedInformerFactory() informers.SharedInformerFactory {
return f.informerFactory return f.informerFactory
} }
// VolumeBinder returns the volume binder used by scheduler.
func (f *framework) VolumeBinder() scheduling.SchedulerVolumeBinder {
return f.volumeBinder
}
func (f *framework) pluginsNeeded(plugins *config.Plugins) map[string]config.Plugin { func (f *framework) pluginsNeeded(plugins *config.Plugins) map[string]config.Plugin {
pgMap := make(map[string]config.Plugin) pgMap := make(map[string]config.Plugin)

4
pkg/scheduler/framework/v1alpha1/interface.go
View File

@ -29,7 +29,6 @@ import (
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/pkg/controller/volume/scheduling"
"k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config"
) )
@ -491,9 +490,6 @@ type FrameworkHandle interface {
ClientSet() clientset.Interface ClientSet() clientset.Interface
SharedInformerFactory() informers.SharedInformerFactory SharedInformerFactory() informers.SharedInformerFactory
// VolumeBinder returns the volume binder used by scheduler.
VolumeBinder() scheduling.SchedulerVolumeBinder
} }
// PreemptHandle incorporates all needed logic to run preemption logic. // PreemptHandle incorporates all needed logic to run preemption logic.