Skip to content

Commit c86f596

Browse files
ahg-gahg-g
committed
remove test/integration dependency on predicates and algorithmprovider
1 parent 79bb357 commit c86f596

File tree

11 files changed

+13
-26
lines changed

11 files changed

+13
-26
lines changed

‎pkg/scheduler/algorithm/predicates/predicates.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ const (
8080
NoVolumeZoneConflictPred = "NoVolumeZoneConflict"
8181
// EvenPodsSpreadPred defines the name of predicate EvenPodsSpread.
8282
EvenPodsSpreadPred = "EvenPodsSpread"
83-
84-
// KubeMaxPDVols defines the maximum number of PD Volumes per kubelet.
85-
KubeMaxPDVols = "KUBE_MAX_PD_VOLS"
8683
)
8784

8885
// IMPORTANT NOTE for predicate developers:

‎pkg/scheduler/framework/plugins/nodevolumelimits/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ go_library(
1212
deps = [
1313
"//pkg/apis/core/v1/helper:go_default_library",
1414
"//pkg/features:go_default_library",
15-
"//pkg/scheduler/algorithm/predicates:go_default_library",
1615
"//pkg/scheduler/framework/v1alpha1:go_default_library",
1716
"//pkg/scheduler/nodeinfo:go_default_library",
1817
"//pkg/volume/util:go_default_library",

‎pkg/scheduler/framework/plugins/nodevolumelimits/non_csi.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"k8s.io/klog"
3636
"k8s.io/kubernetes/pkg/features"
3737
kubefeatures "k8s.io/kubernetes/pkg/features"
38-
"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates"
3938
framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
4039
"k8s.io/kubernetes/pkg/scheduler/nodeinfo"
4140
volumeutil "k8s.io/kubernetes/pkg/volume/util"
@@ -61,6 +60,9 @@ const (
6160

6261
// ErrReasonMaxVolumeCountExceeded is used for MaxVolumeCount predicate error.
6362
ErrReasonMaxVolumeCountExceeded = "node(s) exceed max volume count"
63+
64+
// KubeMaxPDVols defines the maximum number of PD Volumes per kubelet.
65+
KubeMaxPDVols = "KUBE_MAX_PD_VOLS"
6466
)
6567

6668
// 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 {
341343

342344
// getMaxVolLimitFromEnv checks the max PD volumes environment variable, otherwise returning a default value.
343345
func getMaxVolLimitFromEnv() int {
344-
if rawMaxVols := os.Getenv(predicates.KubeMaxPDVols); rawMaxVols != "" {
346+
if rawMaxVols := os.Getenv(KubeMaxPDVols); rawMaxVols != "" {
345347
if parsedMaxVols, err := strconv.Atoi(rawMaxVols); err != nil {
346348
klog.Errorf("Unable to parse maximum PD volumes value, using default: %v", err)
347349
} else if parsedMaxVols <= 0 {

‎pkg/scheduler/framework/plugins/nodevolumelimits/non_csi_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
v1 "k8s.io/api/core/v1"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
csilibplugins "k8s.io/csi-translation-lib/plugins"
29-
"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates"
3029
framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
3130
fakelisters "k8s.io/kubernetes/pkg/scheduler/listers/fake"
3231
utilpointer "k8s.io/utils/pointer"
@@ -1183,7 +1182,7 @@ func TestGCEPDLimits(t *testing.T) {
11831182
}
11841183

11851184
func TestGetMaxVols(t *testing.T) {
1186-
previousValue := os.Getenv(predicates.KubeMaxPDVols)
1185+
previousValue := os.Getenv(KubeMaxPDVols)
11871186

11881187
tests := []struct {
11891188
rawMaxVols string
@@ -1209,17 +1208,17 @@ func TestGetMaxVols(t *testing.T) {
12091208

12101209
for _, test := range tests {
12111210
t.Run(test.name, func(t *testing.T) {
1212-
os.Setenv(predicates.KubeMaxPDVols, test.rawMaxVols)
1211+
os.Setenv(KubeMaxPDVols, test.rawMaxVols)
12131212
result := getMaxVolLimitFromEnv()
12141213
if result != test.expected {
12151214
t.Errorf("expected %v got %v", test.expected, result)
12161215
}
12171216
})
12181217
}
12191218

1220-
os.Unsetenv(predicates.KubeMaxPDVols)
1219+
os.Unsetenv(KubeMaxPDVols)
12211220
if previousValue != "" {
1222-
os.Setenv(predicates.KubeMaxPDVols, previousValue)
1221+
os.Setenv(KubeMaxPDVols, previousValue)
12231222
}
12241223
}
12251224

‎test/integration/scheduler/BUILD‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ go_test(
2828
"//pkg/controller/nodelifecycle:go_default_library",
2929
"//pkg/features:go_default_library",
3030
"//pkg/scheduler:go_default_library",
31-
"//pkg/scheduler/algorithmprovider:go_default_library",
3231
"//pkg/scheduler/apis/config:go_default_library",
3332
"//pkg/scheduler/apis/extender/v1:go_default_library",
3433
"//pkg/scheduler/framework/v1alpha1:go_default_library",
@@ -88,7 +87,6 @@ go_library(
8887
"//pkg/api/v1/pod:go_default_library",
8988
"//pkg/controller/disruption:go_default_library",
9089
"//pkg/scheduler:go_default_library",
91-
"//pkg/scheduler/algorithmprovider:go_default_library",
9290
"//pkg/scheduler/apis/config:go_default_library",
9391
"//pkg/scheduler/apis/config/scheme:go_default_library",
9492
"//pkg/scheduler/apis/config/v1:go_default_library",

‎test/integration/scheduler/extender_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
"k8s.io/apimachinery/pkg/util/wait"
3434
clientset "k8s.io/client-go/kubernetes"
35-
_ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
3635
schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config"
3736
extenderv1 "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1"
3837
imageutils "k8s.io/kubernetes/test/utils/image"

‎test/integration/scheduler/preemption_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import (
3737
"k8s.io/client-go/kubernetes"
3838
clientset "k8s.io/client-go/kubernetes"
3939
restclient "k8s.io/client-go/rest"
40+
"k8s.io/klog"
4041
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
4142
"k8s.io/kubernetes/pkg/apis/scheduling"
4243
"k8s.io/kubernetes/pkg/scheduler"
@@ -45,10 +46,6 @@ import (
4546
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
4647
"k8s.io/kubernetes/plugin/pkg/admission/priority"
4748
testutils "k8s.io/kubernetes/test/utils"
48-
49-
_ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
50-
51-
"k8s.io/klog"
5249
)
5350

5451
var lowPriority, mediumPriority, highPriority = int32(100), int32(200), int32(300)

‎test/integration/scheduler/scheduler_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import (
3838
"k8s.io/client-go/tools/events"
3939
"k8s.io/kubernetes/pkg/api/legacyscheme"
4040
"k8s.io/kubernetes/pkg/scheduler"
41-
_ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
4241
kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
4342
"k8s.io/kubernetes/test/integration/framework"
4443
)

‎test/integration/scheduler/util.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ import (
5353
schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config"
5454
"k8s.io/kubernetes/pkg/scheduler/apis/config/scheme"
5555
schedulerapiv1 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1"
56-
57-
// Register defaults in pkg/scheduler/algorithmprovider.
58-
_ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
5956
taintutils "k8s.io/kubernetes/pkg/util/taints"
6057
"k8s.io/kubernetes/test/integration/framework"
6158
imageutils "k8s.io/kubernetes/test/utils/image"

‎test/integration/volumescheduling/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ go_test(
1717
tags = ["integration"],
1818
deps = [
1919
"//pkg/controller/volume/persistentvolume:go_default_library",
20-
"//pkg/scheduler/algorithm/predicates:go_default_library",
20+
"//pkg/scheduler/framework/plugins/nodevolumelimits:go_default_library",
2121
"//pkg/volume:go_default_library",
2222
"//pkg/volume/testing:go_default_library",
2323
"//staging/src/k8s.io/api/core/v1:go_default_library",

0 commit comments

Comments
 (0)