Merge pull request kubernetes#88401 from gongguan/volume_binder

refactor volume binder

Author: k8s-ci-robot

pkg/controller/volume/scheduling/scheduler_binder.go

@@ -131,6 +131,9 @@ type SchedulerVolumeBinder interface {
 
 	// GetBindingsCache returns the cache used (if any) to store volume binding decisions.
 	GetBindingsCache() PodBindingCache
+
+	// DeletePodBindings will delete pod's bindingDecisions in podBindingCache.
+	DeletePodBindings(pod *v1.Pod)
 }
 
 type volumeBinder struct {
@@ -181,6 +184,14 @@ func (b *volumeBinder) GetBindingsCache() PodBindingCache {
 	return b.podBindingCache
 }
 
+// DeletePodBindings will delete pod's bindingDecisions in podBindingCache.
+func (b *volumeBinder) DeletePodBindings(pod *v1.Pod) {
+	cache := b.podBindingCache
+	if pod != nil {
+		cache.DeleteBindings(pod)
+	}
+}
+
 // FindPodVolumes caches the matching PVs and PVCs to provision per node in podBindingCache.
 // This method intentionally takes in a *v1.Node object instead of using volumebinder.nodeInformer.
 // That's necessary because some operations will need to pass in to the predicate fake node objects.

pkg/controller/volume/scheduling/scheduler_binder_fake.go

@@ -63,3 +63,6 @@ func (b *FakeVolumeBinder) BindPodVolumes(assumedPod *v1.Pod) error {
 func (b *FakeVolumeBinder) GetBindingsCache() PodBindingCache {
 	return nil
 }
+
+// DeletePodBindings implements SchedulerVolumeBinder.DeletePodBindings.
+func (b *FakeVolumeBinder) DeletePodBindings(pod *v1.Pod) {}

pkg/scheduler/BUILD

@@ -11,6 +11,7 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/api/v1/pod:go_default_library",
+        "//pkg/controller/volume/scheduling:go_default_library",
         "//pkg/features:go_default_library",
         "//pkg/scheduler/algorithmprovider:go_default_library",
         "//pkg/scheduler/apis/config:go_default_library",
@@ -28,7 +29,6 @@ go_library(
         "//pkg/scheduler/internal/queue:go_default_library",
         "//pkg/scheduler/metrics:go_default_library",
         "//pkg/scheduler/profile:go_default_library",
-        "//pkg/scheduler/volumebinder:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/api/storage/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
@@ -82,7 +82,6 @@ go_test(
         "//pkg/scheduler/nodeinfo:go_default_library",
         "//pkg/scheduler/profile:go_default_library",
         "//pkg/scheduler/testing:go_default_library",
-        "//pkg/scheduler/volumebinder:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/api/events/v1beta1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
@@ -130,7 +129,6 @@ filegroup(
         "//pkg/scheduler/profile:all-srcs",
         "//pkg/scheduler/testing:all-srcs",
         "//pkg/scheduler/util:all-srcs",
-        "//pkg/scheduler/volumebinder:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],

pkg/scheduler/factory.go

@@ -38,6 +38,7 @@ import (
 	policylisters "k8s.io/client-go/listers/policy/v1beta1"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog"
+	"k8s.io/kubernetes/pkg/controller/volume/scheduling"
 	kubefeatures "k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
 	schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config"
@@ -53,7 +54,6 @@ import (
 	cachedebugger "k8s.io/kubernetes/pkg/scheduler/internal/cache/debugger"
 	internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue"
 	"k8s.io/kubernetes/pkg/scheduler/profile"
-	"k8s.io/kubernetes/pkg/scheduler/volumebinder"
 )
 
 const (
@@ -83,7 +83,7 @@ type Configurator struct {
 	schedulerCache internalcache.Cache
 
 	// Handles volume binding decisions
-	volumeBinder *volumebinder.VolumeBinder
+	volumeBinder scheduling.SchedulerVolumeBinder
 
 	// Disable pod preemption or not.
 	disablePreemption bool

pkg/scheduler/framework/plugins/volumebinding/BUILD

@@ -6,9 +6,9 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/controller/volume/scheduling:go_default_library",
         "//pkg/scheduler/framework/v1alpha1:go_default_library",
         "//pkg/scheduler/nodeinfo:go_default_library",
-        "//pkg/scheduler/volumebinder:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
     ],
@@ -36,7 +36,6 @@ go_test(
         "//pkg/controller/volume/scheduling:go_default_library",
         "//pkg/scheduler/framework/v1alpha1:go_default_library",
         "//pkg/scheduler/nodeinfo:go_default_library",
-        "//pkg/scheduler/volumebinder:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
     ],
 )

pkg/scheduler/framework/plugins/volumebinding/volume_binding.go

@@ -21,14 +21,14 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/kubernetes/pkg/controller/volume/scheduling"
 	framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
 	schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
-	"k8s.io/kubernetes/pkg/scheduler/volumebinder"
 )
 
 // VolumeBinding is a plugin that binds pod volumes in scheduling.
 type VolumeBinding struct {
-	binder *volumebinder.VolumeBinder
+	binder scheduling.SchedulerVolumeBinder
 }
 
 var _ framework.FilterPlugin = &VolumeBinding{}
@@ -72,7 +72,7 @@ func (pl *VolumeBinding) Filter(ctx context.Context, cs *framework.CycleState, p
 		return nil
 	}
 
-	reasons, err := pl.binder.Binder.FindPodVolumes(pod, node)
+	reasons, err := pl.binder.FindPodVolumes(pod, node)
 
 	if err != nil {
 		return framework.NewStatus(framework.Error, err.Error())

pkg/scheduler/framework/plugins/volumebinding/volume_binding_test.go

@@ -23,10 +23,9 @@ import (
 	"testing"
 
 	v1 "k8s.io/api/core/v1"
-	volumescheduling "k8s.io/kubernetes/pkg/controller/volume/scheduling"
+	"k8s.io/kubernetes/pkg/controller/volume/scheduling"
 	framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
 	schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
-	"k8s.io/kubernetes/pkg/scheduler/volumebinder"
 )
 
 func TestVolumeBinding(t *testing.T) {
@@ -44,7 +43,7 @@ func TestVolumeBinding(t *testing.T) {
 		name               string
 		pod                *v1.Pod
 		node               *v1.Node
-		volumeBinderConfig *volumescheduling.FakeVolumeBinderConfig
+		volumeBinderConfig *scheduling.FakeVolumeBinderConfig
 		wantStatus         *framework.Status
 	}{
 		{
@@ -57,7 +56,7 @@ func TestVolumeBinding(t *testing.T) {
 			name: "all bound",
 			pod:  &v1.Pod{Spec: volState},
 			node: &v1.Node{},
-			volumeBinderConfig: &volumescheduling.FakeVolumeBinderConfig{
+			volumeBinderConfig: &scheduling.FakeVolumeBinderConfig{
 				AllBound: true,
 			},
 			wantStatus: nil,
@@ -66,32 +65,32 @@ func TestVolumeBinding(t *testing.T) {
 			name: "unbound/no matches",
 			pod:  &v1.Pod{Spec: volState},
 			node: &v1.Node{},
-			volumeBinderConfig: &volumescheduling.FakeVolumeBinderConfig{
-				FindReasons: []volumescheduling.ConflictReason{volumescheduling.ErrReasonBindConflict},
+			volumeBinderConfig: &scheduling.FakeVolumeBinderConfig{
+				FindReasons: []scheduling.ConflictReason{scheduling.ErrReasonBindConflict},
 			},
-			wantStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, string(volumescheduling.ErrReasonBindConflict)),
+			wantStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, string(scheduling.ErrReasonBindConflict)),
 		},
 		{
 			name: "bound and unbound unsatisfied",
 			pod:  &v1.Pod{Spec: volState},
 			node: &v1.Node{},
-			volumeBinderConfig: &volumescheduling.FakeVolumeBinderConfig{
-				FindReasons: []volumescheduling.ConflictReason{volumescheduling.ErrReasonBindConflict, volumescheduling.ErrReasonNodeConflict},
+			volumeBinderConfig: &scheduling.FakeVolumeBinderConfig{
+				FindReasons: []scheduling.ConflictReason{scheduling.ErrReasonBindConflict, scheduling.ErrReasonNodeConflict},
 			},
-			wantStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, string(volumescheduling.ErrReasonBindConflict), string(volumescheduling.ErrReasonNodeConflict)),
+			wantStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, string(scheduling.ErrReasonBindConflict), string(scheduling.ErrReasonNodeConflict)),
 		},
 		{
 			name:               "unbound/found matches/bind succeeds",
 			pod:                &v1.Pod{Spec: volState},
 			node:               &v1.Node{},
-			volumeBinderConfig: &volumescheduling.FakeVolumeBinderConfig{},
+			volumeBinderConfig: &scheduling.FakeVolumeBinderConfig{},
 			wantStatus:         nil,
 		},
 		{
 			name: "predicate error",
 			pod:  &v1.Pod{Spec: volState},
 			node: &v1.Node{},
-			volumeBinderConfig: &volumescheduling.FakeVolumeBinderConfig{
+			volumeBinderConfig: &scheduling.FakeVolumeBinderConfig{
 				FindErr: findErr,
 			},
 			wantStatus: framework.NewStatus(framework.Error, findErr.Error()),
@@ -102,7 +101,7 @@ func TestVolumeBinding(t *testing.T) {
 		t.Run(item.name, func(t *testing.T) {
 			nodeInfo := schedulernodeinfo.NewNodeInfo()
 			nodeInfo.SetNode(item.node)
-			fakeVolumeBinder := volumebinder.NewFakeVolumeBinder(item.volumeBinderConfig)
+			fakeVolumeBinder := scheduling.NewFakeVolumeBinder(item.volumeBinderConfig)
 			p := &VolumeBinding{
 				binder: fakeVolumeBinder,
 			}

pkg/scheduler/framework/v1alpha1/BUILD

@@ -13,12 +13,12 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/controller/volume/scheduling:go_default_library",
         "//pkg/scheduler/apis/config:go_default_library",
         "//pkg/scheduler/listers:go_default_library",
         "//pkg/scheduler/metrics:go_default_library",
         "//pkg/scheduler/nodeinfo:go_default_library",
         "//pkg/scheduler/util:go_default_library",
-        "//pkg/scheduler/volumebinder:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",

pkg/scheduler/framework/v1alpha1/framework.go

@@ -30,12 +30,12 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog"
+	"k8s.io/kubernetes/pkg/controller/volume/scheduling"
 	"k8s.io/kubernetes/pkg/scheduler/apis/config"
 	schedulerlisters "k8s.io/kubernetes/pkg/scheduler/listers"
 	"k8s.io/kubernetes/pkg/scheduler/metrics"
 	schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
 	schedutil "k8s.io/kubernetes/pkg/scheduler/util"
-	"k8s.io/kubernetes/pkg/scheduler/volumebinder"
 )
 
 const (
@@ -78,7 +78,7 @@ type framework struct {
 
 	clientSet       clientset.Interface
 	informerFactory informers.SharedInformerFactory
-	volumeBinder    *volumebinder.VolumeBinder
+	volumeBinder    scheduling.SchedulerVolumeBinder
 
 	metricsRecorder *metricsRecorder
 
@@ -119,7 +119,7 @@ type frameworkOptions struct {
 	informerFactory      informers.SharedInformerFactory
 	snapshotSharedLister schedulerlisters.SharedLister
 	metricsRecorder      *metricsRecorder
-	volumeBinder         *volumebinder.VolumeBinder
+	volumeBinder         scheduling.SchedulerVolumeBinder
 	runAllFilters        bool
 }
 
@@ -163,7 +163,7 @@ func withMetricsRecorder(recorder *metricsRecorder) Option {
 }
 
 // WithVolumeBinder sets volume binder for the scheduling framework.
-func WithVolumeBinder(binder *volumebinder.VolumeBinder) Option {
+func WithVolumeBinder(binder scheduling.SchedulerVolumeBinder) Option {
 	return func(o *frameworkOptions) {
 		o.volumeBinder = binder
 	}
@@ -888,7 +888,7 @@ func (f *framework) SharedInformerFactory() informers.SharedInformerFactory {
 }
 
 // VolumeBinder returns the volume binder used by scheduler.
-func (f *framework) VolumeBinder() *volumebinder.VolumeBinder {
+func (f *framework) VolumeBinder() scheduling.SchedulerVolumeBinder {
 	return f.volumeBinder
 }
 

pkg/scheduler/framework/v1alpha1/interface.go

@@ -29,10 +29,10 @@ 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"
 	schedulerlisters "k8s.io/kubernetes/pkg/scheduler/listers"
 	schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
-	"k8s.io/kubernetes/pkg/scheduler/volumebinder"
 )
 
 // NodeScoreList declares a list of nodes and their scores.
@@ -521,5 +521,5 @@ type FrameworkHandle interface {
 	SharedInformerFactory() informers.SharedInformerFactory
 
 	// VolumeBinder returns the volume binder used by scheduler.
-	VolumeBinder() *volumebinder.VolumeBinder
+	VolumeBinder() scheduling.SchedulerVolumeBinder
 }