Skip to content

Commit 761cf41

Browse files
committed
Move pkg/scheduler/schedulercache -> pkg/scheduler/cache
1 parent d02cf08 commit 761cf41

File tree

88 files changed

+97
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+97
-97
lines changed

cmd/kubeadm/.import-restrictions

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
"k8s.io/kubernetes/pkg/registry/rbac/validation",
119119
"k8s.io/kubernetes/pkg/scheduler/algorithm",
120120
"k8s.io/kubernetes/pkg/scheduler/api",
121-
"k8s.io/kubernetes/pkg/scheduler/schedulercache",
121+
"k8s.io/kubernetes/pkg/scheduler/cache",
122122
"k8s.io/kubernetes/pkg/scheduler/util",
123123
"k8s.io/kubernetes/pkg/security/apparmor",
124124
"k8s.io/kubernetes/pkg/serviceaccount",

pkg/controller/daemon/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ go_library(
2323
"//pkg/kubelet/types:go_default_library",
2424
"//pkg/scheduler/algorithm:go_default_library",
2525
"//pkg/scheduler/algorithm/predicates:go_default_library",
26-
"//pkg/scheduler/schedulercache:go_default_library",
26+
"//pkg/scheduler/cache:go_default_library",
2727
"//pkg/util/labels:go_default_library",
2828
"//pkg/util/metrics:go_default_library",
2929
"//vendor/github.com/golang/glog:go_default_library",

pkg/controller/daemon/daemon_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import (
5555
kubelettypes "k8s.io/kubernetes/pkg/kubelet/types"
5656
"k8s.io/kubernetes/pkg/scheduler/algorithm"
5757
"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates"
58-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
58+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
5959
"k8s.io/kubernetes/pkg/util/metrics"
6060
)
6161

pkg/kubectl/.import-restrictions

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates",
122122
"k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util",
123123
"k8s.io/kubernetes/pkg/scheduler/api",
124-
"k8s.io/kubernetes/pkg/scheduler/schedulercache",
124+
"k8s.io/kubernetes/pkg/scheduler/cache",
125125
"k8s.io/kubernetes/pkg/scheduler/util",
126126
"k8s.io/kubernetes/pkg/scheduler/volumebinder",
127127
"k8s.io/kubernetes/pkg/security/apparmor",

pkg/kubelet/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ go_test(
195195
"//pkg/kubelet/util/queue:go_default_library",
196196
"//pkg/kubelet/util/sliceutils:go_default_library",
197197
"//pkg/kubelet/volumemanager:go_default_library",
198-
"//pkg/scheduler/schedulercache:go_default_library",
198+
"//pkg/scheduler/cache:go_default_library",
199199
"//pkg/util/mount:go_default_library",
200200
"//pkg/version:go_default_library",
201201
"//pkg/volume:go_default_library",

pkg/kubelet/cm/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ go_library(
9191
"//pkg/kubelet/eviction/api:go_default_library",
9292
"//pkg/kubelet/lifecycle:go_default_library",
9393
"//pkg/kubelet/status:go_default_library",
94-
"//pkg/scheduler/schedulercache:go_default_library",
94+
"//pkg/scheduler/cache:go_default_library",
9595
"//vendor/github.com/golang/glog:go_default_library",
9696
"//vendor/k8s.io/api/core/v1:go_default_library",
9797
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",

pkg/kubelet/cm/container_manager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
2929
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
3030
"k8s.io/kubernetes/pkg/kubelet/status"
31-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
31+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
3232

3333
"fmt"
3434
"strconv"

pkg/kubelet/cm/container_manager_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import (
5252
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
5353
"k8s.io/kubernetes/pkg/kubelet/qos"
5454
"k8s.io/kubernetes/pkg/kubelet/status"
55-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
55+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
5656
utilfile "k8s.io/kubernetes/pkg/util/file"
5757
"k8s.io/kubernetes/pkg/util/mount"
5858
"k8s.io/kubernetes/pkg/util/oom"

pkg/kubelet/cm/container_manager_stub.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
2828
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
2929
"k8s.io/kubernetes/pkg/kubelet/status"
30-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
30+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
3131
)
3232

3333
type containerManagerStub struct{}

pkg/kubelet/cm/devicemanager/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ go_library(
2222
"//pkg/kubelet/container:go_default_library",
2323
"//pkg/kubelet/lifecycle:go_default_library",
2424
"//pkg/kubelet/metrics:go_default_library",
25-
"//pkg/scheduler/schedulercache:go_default_library",
25+
"//pkg/scheduler/cache:go_default_library",
2626
"//vendor/github.com/golang/glog:go_default_library",
2727
"//vendor/google.golang.org/grpc:go_default_library",
2828
"//vendor/k8s.io/api/core/v1:go_default_library",
@@ -42,7 +42,7 @@ go_test(
4242
"//pkg/kubelet/apis/deviceplugin/v1beta1:go_default_library",
4343
"//pkg/kubelet/checkpointmanager:go_default_library",
4444
"//pkg/kubelet/lifecycle:go_default_library",
45-
"//pkg/scheduler/schedulercache:go_default_library",
45+
"//pkg/scheduler/cache:go_default_library",
4646
"//vendor/github.com/stretchr/testify/assert:go_default_library",
4747
"//vendor/github.com/stretchr/testify/require:go_default_library",
4848
"//vendor/k8s.io/api/core/v1:go_default_library",

pkg/kubelet/cm/devicemanager/manager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
"k8s.io/kubernetes/pkg/kubelet/config"
4040
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
4141
"k8s.io/kubernetes/pkg/kubelet/metrics"
42-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
42+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
4343
)
4444

4545
// ActivePodsFunc is a function that returns a list of pods to reconcile.

pkg/kubelet/cm/devicemanager/manager_stub.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1"
2222
"k8s.io/kubernetes/pkg/kubelet/config"
2323
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
24-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
24+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
2525
)
2626

2727
// ManagerStub provides a simple stub implementation for the Device Manager.

pkg/kubelet/cm/devicemanager/manager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1"
3636
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
3737
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
38-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
38+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
3939
)
4040

4141
const (

pkg/kubelet/cm/devicemanager/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/kubernetes/pkg/kubelet/config"
2525
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
2626
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
27-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
27+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
2828
)
2929

3030
// Manager manages all the Device Plugins running on a node.

pkg/kubelet/kubelet_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ import (
6464
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
6565
"k8s.io/kubernetes/pkg/kubelet/util/queue"
6666
kubeletvolume "k8s.io/kubernetes/pkg/kubelet/volumemanager"
67-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
67+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
6868
"k8s.io/kubernetes/pkg/util/mount"
6969
"k8s.io/kubernetes/pkg/volume"
7070
_ "k8s.io/kubernetes/pkg/volume/host_path"

pkg/kubelet/lifecycle/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ go_library(
2323
"//pkg/kubelet/util/format:go_default_library",
2424
"//pkg/scheduler/algorithm:go_default_library",
2525
"//pkg/scheduler/algorithm/predicates:go_default_library",
26-
"//pkg/scheduler/schedulercache:go_default_library",
26+
"//pkg/scheduler/cache:go_default_library",
2727
"//pkg/security/apparmor:go_default_library",
2828
"//vendor/github.com/golang/glog:go_default_library",
2929
"//vendor/k8s.io/api/core/v1:go_default_library",
@@ -42,7 +42,7 @@ go_test(
4242
deps = [
4343
"//pkg/kubelet/container:go_default_library",
4444
"//pkg/kubelet/util/format:go_default_library",
45-
"//pkg/scheduler/schedulercache:go_default_library",
45+
"//pkg/scheduler/cache:go_default_library",
4646
"//vendor/k8s.io/api/core/v1:go_default_library",
4747
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
4848
"//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",

pkg/kubelet/lifecycle/predicate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"k8s.io/kubernetes/pkg/kubelet/util/format"
2727
"k8s.io/kubernetes/pkg/scheduler/algorithm"
2828
"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates"
29-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
29+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
3030
)
3131

3232
type getNodeAnyWayFuncType func() (*v1.Node, error)

pkg/kubelet/lifecycle/predicate_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"k8s.io/api/core/v1"
2424
"k8s.io/apimachinery/pkg/api/resource"
25-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
25+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
2626
)
2727

2828
var (

pkg/scheduler/BUILD

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ go_test(
1515
"//pkg/controller/volume/persistentvolume:go_default_library",
1616
"//pkg/scheduler/algorithm:go_default_library",
1717
"//pkg/scheduler/algorithm/predicates:go_default_library",
18+
"//pkg/scheduler/cache:go_default_library",
1819
"//pkg/scheduler/core:go_default_library",
19-
"//pkg/scheduler/schedulercache:go_default_library",
2020
"//pkg/scheduler/testing:go_default_library",
2121
"//pkg/scheduler/volumebinder:go_default_library",
2222
"//vendor/k8s.io/api/core/v1:go_default_library",
@@ -44,9 +44,9 @@ go_library(
4444
"//pkg/scheduler/algorithm:go_default_library",
4545
"//pkg/scheduler/algorithm/predicates:go_default_library",
4646
"//pkg/scheduler/api:go_default_library",
47+
"//pkg/scheduler/cache:go_default_library",
4748
"//pkg/scheduler/core:go_default_library",
4849
"//pkg/scheduler/metrics:go_default_library",
49-
"//pkg/scheduler/schedulercache:go_default_library",
5050
"//pkg/scheduler/util:go_default_library",
5151
"//pkg/scheduler/volumebinder:go_default_library",
5252
"//vendor/github.com/golang/glog:go_default_library",
@@ -75,10 +75,10 @@ filegroup(
7575
"//pkg/scheduler/algorithm:all-srcs",
7676
"//pkg/scheduler/algorithmprovider:all-srcs",
7777
"//pkg/scheduler/api:all-srcs",
78+
"//pkg/scheduler/cache:all-srcs",
7879
"//pkg/scheduler/core:all-srcs",
7980
"//pkg/scheduler/factory:all-srcs",
8081
"//pkg/scheduler/metrics:all-srcs",
81-
"//pkg/scheduler/schedulercache:all-srcs",
8282
"//pkg/scheduler/testing:all-srcs",
8383
"//pkg/scheduler/util:all-srcs",
8484
"//pkg/scheduler/volumebinder:all-srcs",

pkg/scheduler/algorithm/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ go_library(
1818
deps = [
1919
"//pkg/apis/core:go_default_library",
2020
"//pkg/scheduler/api:go_default_library",
21-
"//pkg/scheduler/schedulercache:go_default_library",
21+
"//pkg/scheduler/cache:go_default_library",
2222
"//vendor/k8s.io/api/apps/v1beta1:go_default_library",
2323
"//vendor/k8s.io/api/core/v1:go_default_library",
2424
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
@@ -34,7 +34,7 @@ go_test(
3434
],
3535
embed = [":go_default_library"],
3636
deps = [
37-
"//pkg/scheduler/schedulercache:go_default_library",
37+
"//pkg/scheduler/cache:go_default_library",
3838
"//vendor/k8s.io/api/core/v1:go_default_library",
3939
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
4040
],

pkg/scheduler/algorithm/predicates/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ go_library(
2323
"//pkg/kubelet/apis:go_default_library",
2424
"//pkg/scheduler/algorithm:go_default_library",
2525
"//pkg/scheduler/algorithm/priorities/util:go_default_library",
26-
"//pkg/scheduler/schedulercache:go_default_library",
26+
"//pkg/scheduler/cache:go_default_library",
2727
"//pkg/scheduler/util:go_default_library",
2828
"//pkg/scheduler/volumebinder:go_default_library",
2929
"//pkg/volume/util:go_default_library",
@@ -55,7 +55,7 @@ go_test(
5555
"//pkg/apis/core/v1/helper:go_default_library",
5656
"//pkg/kubelet/apis:go_default_library",
5757
"//pkg/scheduler/algorithm:go_default_library",
58-
"//pkg/scheduler/schedulercache:go_default_library",
58+
"//pkg/scheduler/cache:go_default_library",
5959
"//pkg/scheduler/testing:go_default_library",
6060
"//vendor/k8s.io/api/core/v1:go_default_library",
6161
"//vendor/k8s.io/api/storage/v1:go_default_library",

pkg/scheduler/algorithm/predicates/metadata.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/client-go/util/workqueue"
3030
"k8s.io/kubernetes/pkg/scheduler/algorithm"
3131
priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util"
32-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
32+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
3333
schedutil "k8s.io/kubernetes/pkg/scheduler/util"
3434
)
3535

pkg/scheduler/algorithm/predicates/metadata_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"k8s.io/api/core/v1"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
27-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
27+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
2828
schedulertesting "k8s.io/kubernetes/pkg/scheduler/testing"
2929
)
3030

pkg/scheduler/algorithm/predicates/predicates.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
4444
"k8s.io/kubernetes/pkg/scheduler/algorithm"
4545
priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util"
46-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
46+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
4747
schedutil "k8s.io/kubernetes/pkg/scheduler/util"
4848
"k8s.io/kubernetes/pkg/scheduler/volumebinder"
4949
volumeutil "k8s.io/kubernetes/pkg/volume/util"

pkg/scheduler/algorithm/predicates/predicates_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
3333
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
3434
"k8s.io/kubernetes/pkg/scheduler/algorithm"
35-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
35+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
3636
schedulertesting "k8s.io/kubernetes/pkg/scheduler/testing"
3737
)
3838

pkg/scheduler/algorithm/priorities/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ go_library(
3333
"//pkg/scheduler/algorithm/predicates:go_default_library",
3434
"//pkg/scheduler/algorithm/priorities/util:go_default_library",
3535
"//pkg/scheduler/api:go_default_library",
36-
"//pkg/scheduler/schedulercache:go_default_library",
36+
"//pkg/scheduler/cache:go_default_library",
3737
"//pkg/util/node:go_default_library",
3838
"//vendor/github.com/golang/glog:go_default_library",
3939
"//vendor/k8s.io/api/core/v1:go_default_library",
@@ -68,7 +68,7 @@ go_test(
6868
"//pkg/kubelet/apis:go_default_library",
6969
"//pkg/scheduler/algorithm/priorities/util:go_default_library",
7070
"//pkg/scheduler/api:go_default_library",
71-
"//pkg/scheduler/schedulercache:go_default_library",
71+
"//pkg/scheduler/cache:go_default_library",
7272
"//pkg/scheduler/testing:go_default_library",
7373
"//vendor/k8s.io/api/apps/v1beta1:go_default_library",
7474
"//vendor/k8s.io/api/core/v1:go_default_library",

pkg/scheduler/algorithm/priorities/balanced_resource_allocation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
utilfeature "k8s.io/apiserver/pkg/util/feature"
2323
"k8s.io/kubernetes/pkg/features"
2424
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
25-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
25+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
2626
)
2727

2828
var (

pkg/scheduler/algorithm/priorities/balanced_resource_allocation_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
utilfeature "k8s.io/apiserver/pkg/util/feature"
2828
"k8s.io/kubernetes/pkg/features"
2929
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
30-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
30+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
3131
)
3232

3333
// getExistingVolumeCountForNode gets the current number of volumes on node.

pkg/scheduler/algorithm/priorities/image_locality.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"k8s.io/api/core/v1"
2323
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
24-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
24+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
2525
)
2626

2727
// This is a reasonable size range of all container images. 90%ile of images on dockerhub drops into this range.

pkg/scheduler/algorithm/priorities/image_locality_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
27-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
27+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
2828
)
2929

3030
func TestImageLocalityPriority(t *testing.T) {

pkg/scheduler/algorithm/priorities/interpod_affinity.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates"
2828
priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util"
2929
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
30-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
30+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
3131

3232
"github.com/golang/glog"
3333
)

pkg/scheduler/algorithm/priorities/interpod_affinity_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
27-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
27+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
2828
schedulertesting "k8s.io/kubernetes/pkg/scheduler/testing"
2929
)
3030

pkg/scheduler/algorithm/priorities/least_requested.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package priorities
1818

1919
import (
2020
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
21-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
21+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
2222
)
2323

2424
var (

pkg/scheduler/algorithm/priorities/least_requested_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/apimachinery/pkg/api/resource"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
27-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
27+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
2828
)
2929

3030
func TestLeastRequested(t *testing.T) {

pkg/scheduler/algorithm/priorities/metadata.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"k8s.io/apimachinery/pkg/labels"
2323
"k8s.io/kubernetes/pkg/scheduler/algorithm"
2424
priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util"
25-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
25+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
2626
)
2727

2828
// PriorityMetadataFactory is a factory to produce PriorityMetadata.

pkg/scheduler/algorithm/priorities/metadata_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"k8s.io/apimachinery/pkg/api/resource"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util"
29-
"k8s.io/kubernetes/pkg/scheduler/schedulercache"
29+
schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
3030
schedulertesting "k8s.io/kubernetes/pkg/scheduler/testing"
3131
)
3232

0 commit comments

Comments
 (0)