Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump k8s deps to 1.27 #608

Merged
merged 8 commits into from
Aug 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
25 changes: 19 additions & 6 deletions cmd/scheduler/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,7 @@ profiles:
registryOptions: []app.Option{app.WithPlugin(podstate.Name, podstate.New)},
wantPlugins: map[string]*config.Plugins{
"default-scheduler": {
PreEnqueue: defaults.PluginsV1beta2.PreEnqueue,
QueueSort: defaults.PluginsV1beta2.QueueSort,
Bind: defaults.PluginsV1beta2.Bind,
PostFilter: defaults.PluginsV1beta2.PostFilter,
Expand All @@ -512,6 +513,7 @@ profiles:
registryOptions: []app.Option{app.WithPlugin(qos.Name, qos.New)},
wantPlugins: map[string]*config.Plugins{
"default-scheduler": {
PreEnqueue: defaults.ExpandedPluginsV1beta3.PreEnqueue,
QueueSort: config.PluginSet{Enabled: []config.Plugin{{Name: qos.Name}}},
Bind: defaults.ExpandedPluginsV1beta3.Bind,
PostFilter: defaults.ExpandedPluginsV1beta3.PostFilter,
Expand All @@ -527,6 +529,7 @@ profiles:
wantPlugins: map[string]*config.Plugins{
"default-scheduler": {
MultiPoint: defaults.ExpandedPluginsV1.MultiPoint,
PreEnqueue: defaults.ExpandedPluginsV1.PreEnqueue,
QueueSort: config.PluginSet{Enabled: []config.Plugin{{Name: coscheduling.Name}}},
Bind: defaults.ExpandedPluginsV1.Bind,
PreFilter: config.PluginSet{
Expand All @@ -551,6 +554,7 @@ profiles:
registryOptions: []app.Option{app.WithPlugin(noderesources.AllocatableName, noderesources.NewAllocatable)},
wantPlugins: map[string]*config.Plugins{
"default-scheduler": {
PreEnqueue: defaults.ExpandedPluginsV1.PreEnqueue,
QueueSort: defaults.ExpandedPluginsV1.QueueSort,
Bind: defaults.ExpandedPluginsV1.Bind,
PreFilter: defaults.ExpandedPluginsV1.PreFilter,
Expand All @@ -569,8 +573,9 @@ profiles:
registryOptions: []app.Option{app.WithPlugin(capacityscheduling.Name, capacityscheduling.New)},
wantPlugins: map[string]*config.Plugins{
"default-scheduler": {
QueueSort: defaults.PluginsV1beta2.QueueSort,
Bind: defaults.PluginsV1beta2.Bind,
PreEnqueue: defaults.PluginsV1beta2.PreEnqueue,
QueueSort: defaults.PluginsV1beta2.QueueSort,
Bind: defaults.PluginsV1beta2.Bind,
PreFilter: config.PluginSet{
Enabled: append(defaults.PluginsV1beta2.PreFilter.Enabled, config.Plugin{Name: capacityscheduling.Name}),
},
Expand All @@ -591,8 +596,9 @@ profiles:
registryOptions: []app.Option{app.WithPlugin(capacityscheduling.Name, capacityscheduling.New)},
wantPlugins: map[string]*config.Plugins{
"default-scheduler": {
QueueSort: defaults.ExpandedPluginsV1beta3.QueueSort,
Bind: defaults.ExpandedPluginsV1beta3.Bind,
PreEnqueue: defaults.ExpandedPluginsV1beta3.PreEnqueue,
QueueSort: defaults.ExpandedPluginsV1beta3.QueueSort,
Bind: defaults.ExpandedPluginsV1beta3.Bind,
PreFilter: config.PluginSet{
Enabled: append(defaults.ExpandedPluginsV1beta3.PreFilter.Enabled, config.Plugin{Name: capacityscheduling.Name}),
},
Expand All @@ -613,6 +619,7 @@ profiles:
registryOptions: []app.Option{app.WithPlugin(targetloadpacking.Name, targetloadpacking.New)},
wantPlugins: map[string]*config.Plugins{
"default-scheduler": {
PreEnqueue: defaults.ExpandedPluginsV1beta3.PreEnqueue,
QueueSort: defaults.ExpandedPluginsV1beta3.QueueSort,
Bind: defaults.ExpandedPluginsV1beta3.Bind,
PreFilter: defaults.ExpandedPluginsV1beta3.PreFilter,
Expand All @@ -631,6 +638,7 @@ profiles:
registryOptions: []app.Option{app.WithPlugin(targetloadpacking.Name, targetloadpacking.New)},
wantPlugins: map[string]*config.Plugins{
"default-scheduler": {
PreEnqueue: defaults.ExpandedPluginsV1beta3.PreEnqueue,
QueueSort: defaults.ExpandedPluginsV1beta3.QueueSort,
Bind: defaults.ExpandedPluginsV1beta3.Bind,
PreFilter: defaults.ExpandedPluginsV1beta3.PreFilter,
Expand All @@ -649,6 +657,7 @@ profiles:
registryOptions: []app.Option{app.WithPlugin(loadvariationriskbalancing.Name, loadvariationriskbalancing.New)},
wantPlugins: map[string]*config.Plugins{
"default-scheduler": {
PreEnqueue: defaults.ExpandedPluginsV1beta3.PreEnqueue,
QueueSort: defaults.ExpandedPluginsV1beta3.QueueSort,
Bind: defaults.ExpandedPluginsV1beta3.Bind,
PreFilter: defaults.ExpandedPluginsV1beta3.PreFilter,
Expand All @@ -667,6 +676,7 @@ profiles:
registryOptions: []app.Option{app.WithPlugin(lowriskovercommitment.Name, lowriskovercommitment.New)},
wantPlugins: map[string]*config.Plugins{
"default-scheduler": {
PreEnqueue: defaults.ExpandedPluginsV1beta3.PreEnqueue,
QueueSort: defaults.ExpandedPluginsV1beta3.QueueSort,
Bind: defaults.ExpandedPluginsV1beta3.Bind,
PreFilter: defaults.ExpandedPluginsV1beta3.PreFilter,
Expand All @@ -685,6 +695,7 @@ profiles:
registryOptions: []app.Option{app.WithPlugin(noderesourcetopology.Name, noderesourcetopology.New)},
wantPlugins: map[string]*config.Plugins{
"default-scheduler": {
PreEnqueue: defaults.ExpandedPluginsV1.PreEnqueue,
QueueSort: defaults.ExpandedPluginsV1.QueueSort,
Bind: defaults.ExpandedPluginsV1.Bind,
PreFilter: defaults.ExpandedPluginsV1.PreFilter,
Expand All @@ -703,6 +714,7 @@ profiles:
registryOptions: []app.Option{app.WithPlugin(topologicalsort.Name, topologicalsort.New)},
wantPlugins: map[string]*config.Plugins{
"default-scheduler": {
PreEnqueue: defaults.ExpandedPluginsV1beta3.PreEnqueue,
QueueSort: config.PluginSet{Enabled: []config.Plugin{{Name: topologicalsort.Name}}},
Bind: defaults.ExpandedPluginsV1beta3.Bind,
PostFilter: defaults.ExpandedPluginsV1beta3.PostFilter,
Expand All @@ -717,8 +729,9 @@ profiles:
registryOptions: []app.Option{app.WithPlugin(networkoverhead.Name, networkoverhead.New)},
wantPlugins: map[string]*config.Plugins{
"default-scheduler": {
QueueSort: defaults.ExpandedPluginsV1beta3.QueueSort,
Bind: defaults.ExpandedPluginsV1beta3.Bind,
PreEnqueue: defaults.ExpandedPluginsV1beta3.PreEnqueue,
QueueSort: defaults.ExpandedPluginsV1beta3.QueueSort,
Bind: defaults.ExpandedPluginsV1beta3.Bind,
PreFilter: config.PluginSet{
Enabled: append(defaults.ExpandedPluginsV1beta3.PreFilter.Enabled, config.Plugin{Name: networkoverhead.Name}),
},
Expand Down
171 changes: 88 additions & 83 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,47 +1,49 @@
module sigs.k8s.io/scheduler-plugins

go 1.19
go 1.20

require (
github.com/diktyo-io/appgroup-api v1.0.1-alpha
github.com/diktyo-io/networktopology-api v1.0.1-alpha
github.com/dustin/go-humanize v1.0.0
github.com/go-logr/logr v1.2.3
github.com/go-logr/logr v1.2.4
github.com/google/go-cmp v0.5.9
github.com/k8stopologyawareschedwg/noderesourcetopology-api v0.1.1
github.com/k8stopologyawareschedwg/podfingerprint v0.2.2
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/paypal/load-watcher v0.2.3
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.0
github.com/stretchr/testify v1.8.1
gonum.org/v1/gonum v0.12.0
k8s.io/api v0.26.7
k8s.io/apimachinery v0.26.7
k8s.io/apiserver v0.26.7
k8s.io/client-go v0.26.7
k8s.io/code-generator v0.26.7
k8s.io/component-base v0.26.7
k8s.io/component-helpers v0.26.7
k8s.io/api v0.27.4
k8s.io/apimachinery v0.27.4
k8s.io/apiserver v0.27.4
k8s.io/client-go v0.27.4
k8s.io/code-generator v0.27.4
k8s.io/component-base v0.27.4
k8s.io/component-helpers v0.27.4
k8s.io/klog/hack/tools v0.0.0-20210917071902-331d2323a192
k8s.io/klog/v2 v2.80.1
k8s.io/kube-scheduler v0.26.7
k8s.io/kubernetes v1.26.7
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
sigs.k8s.io/controller-runtime v0.14.2
k8s.io/klog/v2 v2.90.1
k8s.io/kube-scheduler v0.27.4
k8s.io/kubernetes v1.27.4
k8s.io/utils v0.0.0-20230209194617-a36077c30491
sigs.k8s.io/controller-runtime v0.15.0
sigs.k8s.io/yaml v1.3.0
)

require (
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
Expand All @@ -51,12 +53,12 @@ require (
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/cel-go v0.12.6 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gofuzz v1.1.0 // indirect
Expand All @@ -68,10 +70,11 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
Expand All @@ -80,18 +83,18 @@ require (
github.com/opencontainers/selinux v1.10.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/prometheus/client_golang v1.15.1 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/cobra v1.6.0 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
Expand All @@ -105,65 +108,67 @@ require (
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/exp v0.0.0-20210220032938-85be41e4509f // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.6.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
golang.org/x/tools v0.9.1 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd // indirect
google.golang.org/grpc v1.51.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.26.7 // indirect
k8s.io/cloud-provider v0.26.7 // indirect
k8s.io/csi-translation-lib v0.26.7 // indirect
k8s.io/dynamic-resource-allocation v0.26.7 // indirect
k8s.io/apiextensions-apiserver v0.27.4 // indirect
k8s.io/cloud-provider v0.27.4 // indirect
k8s.io/controller-manager v0.27.4 // indirect
k8s.io/csi-translation-lib v0.27.4 // indirect
k8s.io/dynamic-resource-allocation v0.27.4 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/kms v0.26.7 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/metrics v0.26.7 // indirect
k8s.io/mount-utils v0.26.7 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
k8s.io/kms v0.27.4 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/kubelet v0.27.4 // indirect
k8s.io/metrics v0.27.4 // indirect
k8s.io/mount-utils v0.27.4 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.26.7
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.7
k8s.io/apimachinery => k8s.io/apimachinery v0.26.7
k8s.io/apiserver => k8s.io/apiserver v0.26.7
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.7
k8s.io/client-go => k8s.io/client-go v0.26.7
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.7
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.7
k8s.io/code-generator => k8s.io/code-generator v0.26.7
k8s.io/component-base => k8s.io/component-base v0.26.7
k8s.io/component-helpers => k8s.io/component-helpers v0.26.7
k8s.io/controller-manager => k8s.io/controller-manager v0.26.7
k8s.io/cri-api => k8s.io/cri-api v0.26.7
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.7
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.7
k8s.io/kms => k8s.io/kms v0.26.7
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.7
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.7
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.7
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.7
k8s.io/kubectl => k8s.io/kubectl v0.26.7
k8s.io/kubelet => k8s.io/kubelet v0.26.7
k8s.io/kubernetes => k8s.io/kubernetes v1.26.7
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.7
k8s.io/metrics => k8s.io/metrics v0.26.7
k8s.io/mount-utils => k8s.io/mount-utils v0.26.7
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.7
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.7
k8s.io/api => k8s.io/api v0.27.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.4
k8s.io/apimachinery => k8s.io/apimachinery v0.27.4
k8s.io/apiserver => k8s.io/apiserver v0.27.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.4
k8s.io/client-go => k8s.io/client-go v0.27.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.4
k8s.io/code-generator => k8s.io/code-generator v0.27.4
k8s.io/component-base => k8s.io/component-base v0.27.4
k8s.io/component-helpers => k8s.io/component-helpers v0.27.4
k8s.io/controller-manager => k8s.io/controller-manager v0.27.4
k8s.io/cri-api => k8s.io/cri-api v0.27.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.4
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.4
k8s.io/kms => k8s.io/kms v0.27.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.4
k8s.io/kubectl => k8s.io/kubectl v0.27.4
k8s.io/kubelet => k8s.io/kubelet v0.27.4
k8s.io/kubernetes => k8s.io/kubernetes v1.27.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.4
k8s.io/metrics => k8s.io/metrics v0.27.4
k8s.io/mount-utils => k8s.io/mount-utils v0.27.4
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.4
)
Loading