diff --git a/pkg/scheduler/algorithm/predicates/predicates.go b/pkg/scheduler/algorithm/predicates/predicates.go index dd1dfd54961..39d9814f0cf 100644 --- a/pkg/scheduler/algorithm/predicates/predicates.go +++ b/pkg/scheduler/algorithm/predicates/predicates.go @@ -80,9 +80,6 @@ const ( NoVolumeZoneConflictPred = "NoVolumeZoneConflict" // EvenPodsSpreadPred defines the name of predicate EvenPodsSpread. EvenPodsSpreadPred = "EvenPodsSpread" - - // KubeMaxPDVols defines the maximum number of PD Volumes per kubelet. - KubeMaxPDVols = "KUBE_MAX_PD_VOLS" ) // IMPORTANT NOTE for predicate developers: diff --git a/pkg/scheduler/framework/plugins/nodevolumelimits/BUILD b/pkg/scheduler/framework/plugins/nodevolumelimits/BUILD index 442032a6b80..124163951da 100644 --- a/pkg/scheduler/framework/plugins/nodevolumelimits/BUILD +++ b/pkg/scheduler/framework/plugins/nodevolumelimits/BUILD @@ -12,7 +12,6 @@ go_library( deps = [ "//pkg/apis/core/v1/helper:go_default_library", "//pkg/features:go_default_library", - "//pkg/scheduler/algorithm/predicates:go_default_library", "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/nodeinfo:go_default_library", "//pkg/volume/util:go_default_library", diff --git a/pkg/scheduler/framework/plugins/nodevolumelimits/non_csi.go b/pkg/scheduler/framework/plugins/nodevolumelimits/non_csi.go index 26809a77428..617b65a0e9a 100644 --- a/pkg/scheduler/framework/plugins/nodevolumelimits/non_csi.go +++ b/pkg/scheduler/framework/plugins/nodevolumelimits/non_csi.go @@ -35,7 +35,6 @@ import ( "k8s.io/klog" "k8s.io/kubernetes/pkg/features" kubefeatures "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" "k8s.io/kubernetes/pkg/scheduler/nodeinfo" volumeutil "k8s.io/kubernetes/pkg/volume/util" @@ -61,6 +60,9 @@ const ( // ErrReasonMaxVolumeCountExceeded is used for MaxVolumeCount predicate error. ErrReasonMaxVolumeCountExceeded = "node(s) exceed max volume count" + + // KubeMaxPDVols defines the maximum number of PD Volumes per kubelet. + KubeMaxPDVols = "KUBE_MAX_PD_VOLS" ) // AzureDiskName is the name of the plugin used in the plugin registry and configurations. @@ -341,7 +343,7 @@ func (pl *nonCSILimits) matchProvisioner(pvc *v1.PersistentVolumeClaim) bool { // getMaxVolLimitFromEnv checks the max PD volumes environment variable, otherwise returning a default value. func getMaxVolLimitFromEnv() int { - if rawMaxVols := os.Getenv(predicates.KubeMaxPDVols); rawMaxVols != "" { + if rawMaxVols := os.Getenv(KubeMaxPDVols); rawMaxVols != "" { if parsedMaxVols, err := strconv.Atoi(rawMaxVols); err != nil { klog.Errorf("Unable to parse maximum PD volumes value, using default: %v", err) } else if parsedMaxVols <= 0 { diff --git a/pkg/scheduler/framework/plugins/nodevolumelimits/non_csi_test.go b/pkg/scheduler/framework/plugins/nodevolumelimits/non_csi_test.go index ba3bea6ed23..c919567c960 100644 --- a/pkg/scheduler/framework/plugins/nodevolumelimits/non_csi_test.go +++ b/pkg/scheduler/framework/plugins/nodevolumelimits/non_csi_test.go @@ -26,7 +26,6 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" csilibplugins "k8s.io/csi-translation-lib/plugins" - "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" fakelisters "k8s.io/kubernetes/pkg/scheduler/listers/fake" utilpointer "k8s.io/utils/pointer" @@ -1183,7 +1182,7 @@ func TestGCEPDLimits(t *testing.T) { } func TestGetMaxVols(t *testing.T) { - previousValue := os.Getenv(predicates.KubeMaxPDVols) + previousValue := os.Getenv(KubeMaxPDVols) tests := []struct { rawMaxVols string @@ -1209,7 +1208,7 @@ func TestGetMaxVols(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - os.Setenv(predicates.KubeMaxPDVols, test.rawMaxVols) + os.Setenv(KubeMaxPDVols, test.rawMaxVols) result := getMaxVolLimitFromEnv() if result != test.expected { t.Errorf("expected %v got %v", test.expected, result) @@ -1217,9 +1216,9 @@ func TestGetMaxVols(t *testing.T) { }) } - os.Unsetenv(predicates.KubeMaxPDVols) + os.Unsetenv(KubeMaxPDVols) if previousValue != "" { - os.Setenv(predicates.KubeMaxPDVols, previousValue) + os.Setenv(KubeMaxPDVols, previousValue) } } diff --git a/test/integration/scheduler/BUILD b/test/integration/scheduler/BUILD index 2ce8ee70629..c5503d94534 100644 --- a/test/integration/scheduler/BUILD +++ b/test/integration/scheduler/BUILD @@ -28,7 +28,6 @@ go_test( "//pkg/controller/nodelifecycle:go_default_library", "//pkg/features:go_default_library", "//pkg/scheduler:go_default_library", - "//pkg/scheduler/algorithmprovider:go_default_library", "//pkg/scheduler/apis/config:go_default_library", "//pkg/scheduler/apis/extender/v1:go_default_library", "//pkg/scheduler/framework/v1alpha1:go_default_library", @@ -88,7 +87,6 @@ go_library( "//pkg/api/v1/pod:go_default_library", "//pkg/controller/disruption:go_default_library", "//pkg/scheduler:go_default_library", - "//pkg/scheduler/algorithmprovider:go_default_library", "//pkg/scheduler/apis/config:go_default_library", "//pkg/scheduler/apis/config/scheme:go_default_library", "//pkg/scheduler/apis/config/v1:go_default_library", diff --git a/test/integration/scheduler/extender_test.go b/test/integration/scheduler/extender_test.go index 5ebaa60e2b5..cf10b22d4b7 100644 --- a/test/integration/scheduler/extender_test.go +++ b/test/integration/scheduler/extender_test.go @@ -32,7 +32,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" - _ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" extenderv1 "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1" imageutils "k8s.io/kubernetes/test/utils/image" diff --git a/test/integration/scheduler/preemption_test.go b/test/integration/scheduler/preemption_test.go index 1d0f96081d0..ac65462fe11 100644 --- a/test/integration/scheduler/preemption_test.go +++ b/test/integration/scheduler/preemption_test.go @@ -37,6 +37,7 @@ import ( "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" + "k8s.io/klog" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/apis/scheduling" "k8s.io/kubernetes/pkg/scheduler" @@ -45,10 +46,6 @@ import ( schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo" "k8s.io/kubernetes/plugin/pkg/admission/priority" testutils "k8s.io/kubernetes/test/utils" - - _ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" - - "k8s.io/klog" ) var lowPriority, mediumPriority, highPriority = int32(100), int32(200), int32(300) diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/scheduler/scheduler_test.go index 634c7e4bad9..dbb09cb84c5 100644 --- a/test/integration/scheduler/scheduler_test.go +++ b/test/integration/scheduler/scheduler_test.go @@ -38,7 +38,6 @@ import ( "k8s.io/client-go/tools/events" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/scheduler" - _ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/test/integration/framework" ) diff --git a/test/integration/scheduler/util.go b/test/integration/scheduler/util.go index 42f1bf479c1..abb43771a38 100644 --- a/test/integration/scheduler/util.go +++ b/test/integration/scheduler/util.go @@ -53,9 +53,6 @@ import ( schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme" schedulerapiv1 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1" - - // Register defaults in pkg/scheduler/algorithmprovider. - _ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" taintutils "k8s.io/kubernetes/pkg/util/taints" "k8s.io/kubernetes/test/integration/framework" imageutils "k8s.io/kubernetes/test/utils/image" diff --git a/test/integration/volumescheduling/BUILD b/test/integration/volumescheduling/BUILD index 9eb967183ab..e3cc3842987 100644 --- a/test/integration/volumescheduling/BUILD +++ b/test/integration/volumescheduling/BUILD @@ -17,7 +17,7 @@ go_test( tags = ["integration"], deps = [ "//pkg/controller/volume/persistentvolume:go_default_library", - "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/framework/plugins/nodevolumelimits:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/test/integration/volumescheduling/volume_binding_test.go b/test/integration/volumescheduling/volume_binding_test.go index 8f9da448423..99e85e61c1d 100644 --- a/test/integration/volumescheduling/volume_binding_test.go +++ b/test/integration/volumescheduling/volume_binding_test.go @@ -40,7 +40,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/controller/volume/persistentvolume" - "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodevolumelimits" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" imageutils "k8s.io/kubernetes/test/utils/image" @@ -425,10 +425,10 @@ func testVolumeBindingStress(t *testing.T, schedulerResyncPeriod time.Duration, // Set max volume limit to the number of PVCs the test will create // TODO: remove when max volume limit allows setting through storageclass - if err := os.Setenv(predicates.KubeMaxPDVols, fmt.Sprintf("%v", podLimit*volsPerPod)); err != nil { + if err := os.Setenv(nodevolumelimits.KubeMaxPDVols, fmt.Sprintf("%v", podLimit*volsPerPod)); err != nil { t.Fatalf("failed to set max pd limit: %v", err) } - defer os.Unsetenv(predicates.KubeMaxPDVols) + defer os.Unsetenv(nodevolumelimits.KubeMaxPDVols) scName := &classWait if dynamic {