Skip to content

Commit 93126ea

Browse files
andrewbatesnetflixandrewbatesnetflix
authored
Update scheduler-plugins to K8s 1.32.5 (#911)
* Upgrade go.mod dependencies to .32.5, and controller-runtime to .20 (no code changes yet) * Update codegen versions in hack scripts, and move k8s upgrade script to hacks directory * Run update-codegen to regenerate at newer version * Update capacity_scheduling for 1.32.5 * Update coscheduling for 1.32.5 * Update resource_allocation for 1.32.5 * Update plugin for 1.32.5 * Update preemption_toleration for 1.32.5 * Update peaks for 1.32.5 * Fix coscheduling test, update to use nodeStatusReader * capacity_scheduling_test WIP * Initialize metrics to fix panic during test run * Fix TestPodEligibleToPreemptOthers by initializing metrics * Fix TestNodeResourcesAllocatable by initializing metrics * Fix TestPodState by initializing metrics * Fix TestPeaksNew by initializing metrics * Fix TestLowRiskOverCommitment_New by initializing metrics * Fix targetloadpacking TestNew by initializing metrics * Fix loadvariationriskbalancing TestNew by initializing metrics * Refactor OrderedScoreFuncs to return a valid, empty slice instead of nil (fix test flake) * Undo OrderedScoreFuncs change, as test is still flaking * Move to preemption.NewEvaluator to fix panic in ev.PreemptPod * Review feedback * ./hack/update-gofmt.sh * Update CRD files to use controller-gen v0.17.3 - Updated controller-gen version annotations from v0.16.5 to v0.17.3 - This aligns the CRD files with the version used in hack/verify-crdgen.sh - Fixes verification script failure * Revert "./hack/update-gofmt.sh" This reverts commit 91ac97d. * Add whitespace then re-run update-gofmt.sh again * Revert "Add whitespace then re-run update-gofmt.sh again" This reverts commit 4774fed. * Hopefully last attempt at import formatting
1 parent 62430e1 commit 93126ea

File tree

44 files changed

+601
-792
lines changed

Some content is hidden

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

44 files changed

+601
-792
lines changed

‎config/crd/bases/scheduling.x-k8s.io_elasticquotas.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/52
7-
controller-gen.kubebuilder.io/version: v0.16.5
7+
controller-gen.kubebuilder.io/version: v0.17.3
88
name: elasticquotas.scheduling.x-k8s.io
99
spec:
1010
group: scheduling.x-k8s.io

‎config/crd/bases/scheduling.x-k8s.io_podgroups.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/50
7-
controller-gen.kubebuilder.io/version: v0.16.5
7+
controller-gen.kubebuilder.io/version: v0.17.3
88
name: podgroups.scheduling.x-k8s.io
99
spec:
1010
group: scheduling.x-k8s.io

‎go.mod

Lines changed: 81 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/scheduler-plugins
22

3-
go 1.22.0
3+
go 1.23.0
44

55
require (
66
github.com/containers/common v0.46.0
@@ -16,26 +16,27 @@ require (
1616
github.com/spf13/pflag v1.0.5
1717
github.com/stretchr/testify v1.9.0
1818
gonum.org/v1/gonum v0.12.0
19-
k8s.io/api v0.31.8
20-
k8s.io/apimachinery v0.31.8
21-
k8s.io/apiserver v0.31.8
22-
k8s.io/client-go v0.31.8
23-
k8s.io/code-generator v0.31.8
24-
k8s.io/component-base v0.31.8
25-
k8s.io/component-helpers v0.31.8
19+
k8s.io/api v0.32.5
20+
k8s.io/apimachinery v0.32.5
21+
k8s.io/apiserver v0.32.5
22+
k8s.io/client-go v0.32.5
23+
k8s.io/code-generator v0.32.5
24+
k8s.io/component-base v0.32.5
25+
k8s.io/component-helpers v0.32.5
2626
k8s.io/klog/v2 v2.130.1
27-
k8s.io/kube-scheduler v0.31.8
28-
k8s.io/kubernetes v1.31.8
29-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
30-
sigs.k8s.io/controller-runtime v0.19.2
27+
k8s.io/kube-scheduler v0.32.5
28+
k8s.io/kubernetes v1.32.5
29+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
30+
sigs.k8s.io/controller-runtime v0.20.4
3131
sigs.k8s.io/logtools v0.9.0
3232
sigs.k8s.io/security-profiles-operator v0.4.0
33-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
33+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2
3434
sigs.k8s.io/yaml v1.4.0
3535
)
3636

3737
require (
38-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
38+
cel.dev/expr v0.18.0 // indirect
39+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
3940
github.com/NYTimes/gziphandler v1.1.1 // indirect
4041
github.com/OneOfOne/xxhash v1.2.8 // indirect
4142
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
@@ -48,44 +49,39 @@ require (
4849
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4950
github.com/crossplane/crossplane-runtime v0.14.1-0.20210713194031-85b19c28ea88 // indirect
5051
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
51-
github.com/distribution/reference v0.5.0 // indirect
52+
github.com/distribution/reference v0.6.0 // indirect
5253
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5354
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
54-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
55+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
5556
github.com/felixge/httpsnoop v1.0.4 // indirect
5657
github.com/francoispqt/gojay v1.2.13 // indirect
5758
github.com/fsnotify/fsnotify v1.7.0 // indirect
5859
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5960
github.com/go-logr/stdr v1.2.2 // indirect
60-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
61+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
6162
github.com/go-openapi/jsonreference v0.20.2 // indirect
62-
github.com/go-openapi/swag v0.22.4 // indirect
63-
github.com/godbus/dbus/v5 v5.1.0 // indirect
63+
github.com/go-openapi/swag v0.23.0 // indirect
6464
github.com/gogo/protobuf v1.3.2 // indirect
65-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6665
github.com/golang/protobuf v1.5.4 // indirect
67-
github.com/google/cel-go v0.20.1 // indirect
66+
github.com/google/btree v1.1.3 // indirect
67+
github.com/google/cel-go v0.22.0 // indirect
6868
github.com/google/gnostic-models v0.6.8 // indirect
6969
github.com/google/gofuzz v1.2.0 // indirect
7070
github.com/google/uuid v1.6.0 // indirect
7171
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
7272
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
73-
github.com/imdario/mergo v0.3.12 // indirect
7473
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7574
github.com/josharian/intern v1.0.0 // indirect
7675
github.com/jpillora/backoff v1.0.0 // indirect
7776
github.com/json-iterator/go v1.1.12 // indirect
7877
github.com/mailru/easyjson v0.7.7 // indirect
79-
github.com/moby/sys/mountinfo v0.7.1 // indirect
8078
github.com/moby/term v0.5.0 // indirect
8179
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8280
github.com/modern-go/reflect2 v1.0.2 // indirect
8381
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8482
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
8583
github.com/opencontainers/go-digest v1.0.0 // indirect
86-
github.com/opencontainers/runc v1.1.13 // indirect
87-
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect
88-
github.com/opencontainers/selinux v1.11.0 // indirect
84+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
8985
github.com/pkg/errors v0.9.1 // indirect
9086
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
9187
github.com/prometheus/client_golang v1.19.1 // indirect
@@ -97,9 +93,9 @@ require (
9793
github.com/spf13/cobra v1.8.1 // indirect
9894
github.com/stoewer/go-strcase v1.3.0 // indirect
9995
github.com/x448/float16 v0.8.4 // indirect
100-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
101-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
102-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
96+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
97+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
98+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
10399
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
104100
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
105101
go.opentelemetry.io/otel v1.28.0 // indirect
@@ -110,73 +106,78 @@ require (
110106
go.opentelemetry.io/otel/trace v1.28.0 // indirect
111107
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
112108
go.uber.org/multierr v1.11.0 // indirect
113-
go.uber.org/zap v1.26.0 // indirect
109+
go.uber.org/zap v1.27.0 // indirect
114110
golang.org/x/crypto v0.31.0 // indirect
115-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
116-
golang.org/x/mod v0.17.0 // indirect
111+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
112+
golang.org/x/mod v0.21.0 // indirect
117113
golang.org/x/net v0.33.0 // indirect
118-
golang.org/x/oauth2 v0.21.0 // indirect
114+
golang.org/x/oauth2 v0.23.0 // indirect
119115
golang.org/x/sync v0.10.0 // indirect
120116
golang.org/x/sys v0.28.0 // indirect
121117
golang.org/x/term v0.27.0 // indirect
122118
golang.org/x/text v0.21.0 // indirect
123-
golang.org/x/time v0.5.0 // indirect
124-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
119+
golang.org/x/time v0.7.0 // indirect
120+
golang.org/x/tools v0.26.0 // indirect
125121
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
126-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
127-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
122+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
123+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
128124
google.golang.org/grpc v1.65.0 // indirect
129-
google.golang.org/protobuf v1.34.2 // indirect
125+
google.golang.org/protobuf v1.35.1 // indirect
130126
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
131127
gopkg.in/inf.v0 v0.9.1 // indirect
132128
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
133129
gopkg.in/yaml.v2 v2.4.0 // indirect
134130
gopkg.in/yaml.v3 v3.0.1 // indirect
135-
k8s.io/apiextensions-apiserver v0.31.8 // indirect
136-
k8s.io/cloud-provider v0.31.8 // indirect
137-
k8s.io/controller-manager v0.31.8 // indirect
138-
k8s.io/csi-translation-lib v0.31.8 // indirect
139-
k8s.io/dynamic-resource-allocation v0.31.8 // indirect
140-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
141-
k8s.io/kms v0.31.8 // indirect
142-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
143-
k8s.io/kubelet v0.31.8 // indirect
144-
k8s.io/metrics v0.31.8 // indirect
145-
k8s.io/mount-utils v0.31.8 // indirect
146-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
147-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
131+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
132+
k8s.io/cloud-provider v0.32.5 // indirect
133+
k8s.io/controller-manager v0.32.5 // indirect
134+
k8s.io/csi-translation-lib v0.32.5 // indirect
135+
k8s.io/dynamic-resource-allocation v0.32.5 // indirect
136+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
137+
k8s.io/kms v0.32.5 // indirect
138+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
139+
k8s.io/kubelet v0.32.5 // indirect
140+
k8s.io/metrics v0.32.5 // indirect
141+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
142+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
148143
sigs.k8s.io/release-utils v0.3.0 // indirect
149144
)
150145

151146
replace (
152-
k8s.io/api => k8s.io/api v0.31.8
153-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.8
154-
k8s.io/apimachinery => k8s.io/apimachinery v0.31.8
155-
k8s.io/apiserver => k8s.io/apiserver v0.31.8
156-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.8
157-
k8s.io/client-go => k8s.io/client-go v0.31.8
158-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.8
159-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.8
160-
k8s.io/code-generator => k8s.io/code-generator v0.31.8
161-
k8s.io/component-base => k8s.io/component-base v0.31.8
162-
k8s.io/component-helpers => k8s.io/component-helpers v0.31.8
163-
k8s.io/controller-manager => k8s.io/controller-manager v0.31.8
164-
k8s.io/cri-api => k8s.io/cri-api v0.31.8
165-
k8s.io/cri-client => k8s.io/cri-client v0.31.8
166-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.8
167-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.8
168-
k8s.io/endpointslice => k8s.io/endpointslice v0.31.8
169-
k8s.io/kms => k8s.io/kms v0.31.8
170-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.8
171-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.8
172-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.8
173-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.8
174-
k8s.io/kubectl => k8s.io/kubectl v0.31.8
175-
k8s.io/kubelet => k8s.io/kubelet v0.31.8
176-
k8s.io/kubernetes => k8s.io/kubernetes v1.31.8
147+
k8s.io/api => k8s.io/api v0.32.5
148+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.5
149+
k8s.io/apimachinery => k8s.io/apimachinery v0.32.5
150+
k8s.io/apiserver => k8s.io/apiserver v0.32.5
151+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.5
152+
k8s.io/client-go => k8s.io/client-go v0.32.5
153+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.5
154+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.5
155+
k8s.io/code-generator => k8s.io/code-generator v0.32.5
156+
k8s.io/component-base => k8s.io/component-base v0.32.5
157+
k8s.io/component-helpers => k8s.io/component-helpers v0.32.5
158+
k8s.io/controller-manager => k8s.io/controller-manager v0.32.5
159+
k8s.io/cri-api => k8s.io/cri-api v0.32.5
160+
k8s.io/cri-client => k8s.io/cri-client v0.32.5
161+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.5
162+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.5
163+
k8s.io/endpointslice => k8s.io/endpointslice v0.32.5
164+
k8s.io/kms => k8s.io/kms v0.32.5
165+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.5
166+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.5
167+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.5
168+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.5
169+
k8s.io/kubectl => k8s.io/kubectl v0.32.5
170+
k8s.io/kubelet => k8s.io/kubelet v0.32.5
171+
k8s.io/kubernetes => k8s.io/kubernetes v1.32.5
177172
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.8
178-
k8s.io/metrics => k8s.io/metrics v0.31.8
179-
k8s.io/mount-utils => k8s.io/mount-utils v0.31.8
180-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.8
181-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.8
173+
k8s.io/metrics => k8s.io/metrics v0.32.5
174+
k8s.io/mount-utils => k8s.io/mount-utils v0.32.5
175+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.5
176+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.5
182177
)
178+
179+
replace k8s.io/externaljwt => k8s.io/externaljwt v0.32.5
180+
181+
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.32.5
182+
183+
replace k8s.io/sample-controller => k8s.io/sample-controller v0.32.5

0 commit comments

Comments
 (0)