From b6d5a3328ac82879f53ef470f9bbc642488f5ea9 Mon Sep 17 00:00:00 2001
From: Wei Huang <wei.huang1@ibm.com>
Date: Wed, 20 May 2020 10:25:15 -0700
Subject: [PATCH] cleanup volume binding leftover

---
 pkg/scheduler/framework/v1alpha1/BUILD        |  1 -
 pkg/scheduler/framework/v1alpha1/framework.go | 16 ----------------
 pkg/scheduler/framework/v1alpha1/interface.go |  4 ----
 3 files changed, 21 deletions(-)

diff --git a/pkg/scheduler/framework/v1alpha1/BUILD b/pkg/scheduler/framework/v1alpha1/BUILD
index a4d8eacbd9a..a94ae699efa 100644
--- a/pkg/scheduler/framework/v1alpha1/BUILD
+++ b/pkg/scheduler/framework/v1alpha1/BUILD
@@ -17,7 +17,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/apis/core/v1/helper:go_default_library",
-        "//pkg/controller/volume/scheduling:go_default_library",
         "//pkg/features:go_default_library",
         "//pkg/scheduler/apis/config:go_default_library",
         "//pkg/scheduler/apis/config/scheme:go_default_library",
diff --git a/pkg/scheduler/framework/v1alpha1/framework.go b/pkg/scheduler/framework/v1alpha1/framework.go
index 4827502dd36..f8f0559ca1d 100644
--- a/pkg/scheduler/framework/v1alpha1/framework.go
+++ b/pkg/scheduler/framework/v1alpha1/framework.go
@@ -30,7 +30,6 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
 	"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/scheme"
 	"k8s.io/kubernetes/pkg/scheduler/internal/parallelize"
@@ -79,7 +78,6 @@ type framework struct {
 
 	clientSet       clientset.Interface
 	informerFactory informers.SharedInformerFactory
-	volumeBinder    scheduling.SchedulerVolumeBinder
 
 	metricsRecorder *metricsRecorder
 
@@ -122,7 +120,6 @@ type frameworkOptions struct {
 	informerFactory      informers.SharedInformerFactory
 	snapshotSharedLister SharedLister
 	metricsRecorder      *metricsRecorder
-	volumeBinder         scheduling.SchedulerVolumeBinder
 	podNominator         PodNominator
 	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.
 func WithPodNominator(nominator PodNominator) Option {
 	return func(o *frameworkOptions) {
@@ -200,7 +190,6 @@ func NewFramework(r Registry, plugins *config.Plugins, args []config.PluginConfi
 		waitingPods:           newWaitingPodsMap(),
 		clientSet:             options.clientSet,
 		informerFactory:       options.informerFactory,
-		volumeBinder:          options.volumeBinder,
 		metricsRecorder:       options.metricsRecorder,
 		preemptHandle:         options.podNominator,
 		runAllFilters:         options.runAllFilters,
@@ -922,11 +911,6 @@ func (f *framework) SharedInformerFactory() informers.SharedInformerFactory {
 	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 {
 	pgMap := make(map[string]config.Plugin)
 
diff --git a/pkg/scheduler/framework/v1alpha1/interface.go b/pkg/scheduler/framework/v1alpha1/interface.go
index 73791d280c2..a126f90192b 100644
--- a/pkg/scheduler/framework/v1alpha1/interface.go
+++ b/pkg/scheduler/framework/v1alpha1/interface.go
@@ -29,7 +29,6 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/informers"
 	clientset "k8s.io/client-go/kubernetes"
-	"k8s.io/kubernetes/pkg/controller/volume/scheduling"
 	"k8s.io/kubernetes/pkg/scheduler/apis/config"
 )
 
@@ -491,9 +490,6 @@ type FrameworkHandle interface {
 	ClientSet() clientset.Interface
 
 	SharedInformerFactory() informers.SharedInformerFactory
-
-	// VolumeBinder returns the volume binder used by scheduler.
-	VolumeBinder() scheduling.SchedulerVolumeBinder
 }
 
 // PreemptHandle incorporates all needed logic to run preemption logic.