Skip to content

Commit cc8def2

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #832 from Huang-Wei/bump-k8s-v1.31.2
bump k8s deps to v1.31.2
2 parents 65920ca + 9e1d98e commit cc8def2

37 files changed

+1467
-832
lines changed

‎.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ hack/tools/bin/*
1717
*.swp
1818
*.sublime-project
1919
*.sublime-workspace
20-
*~
20+
*~
21+
22+
# Ignore vendor/
23+
vendor

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

+1-1
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.14.0
7+
controller-gen.kubebuilder.io/version: v0.16.5
88
name: elasticquotas.scheduling.x-k8s.io
99
spec:
1010
group: scheduling.x-k8s.io

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

+1-1
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.14.0
7+
controller-gen.kubebuilder.io/version: v0.16.5
88
name: podgroups.scheduling.x-k8s.io
99
spec:
1010
group: scheduling.x-k8s.io

‎go.mod

+108-111
Original file line numberDiff line numberDiff line change
@@ -7,179 +7,176 @@ require (
77
github.com/diktyo-io/appgroup-api v1.0.1-alpha
88
github.com/diktyo-io/networktopology-api v1.0.1-alpha
99
github.com/dustin/go-humanize v1.0.1
10-
github.com/go-logr/logr v1.4.1
10+
github.com/go-logr/logr v1.4.2
1111
github.com/google/go-cmp v0.6.0
1212
github.com/k8stopologyawareschedwg/noderesourcetopology-api v0.1.2
1313
github.com/k8stopologyawareschedwg/podfingerprint v0.2.2
1414
github.com/patrickmn/go-cache v2.1.0+incompatible
15-
github.com/paypal/load-watcher v0.2.3
15+
github.com/paypal/load-watcher v0.2.4
1616
github.com/spf13/pflag v1.0.5
17-
github.com/stretchr/testify v1.8.4
17+
github.com/stretchr/testify v1.9.0
1818
gonum.org/v1/gonum v0.12.0
19-
k8s.io/api v0.30.6
20-
k8s.io/apimachinery v0.30.6
21-
k8s.io/apiserver v0.30.6
22-
k8s.io/client-go v0.30.6
23-
k8s.io/code-generator v0.30.6
24-
k8s.io/component-base v0.30.6
25-
k8s.io/component-helpers v0.30.6
26-
k8s.io/klog/hack/tools v0.0.0-20210917071902-331d2323a192
27-
k8s.io/klog/v2 v2.120.1
28-
k8s.io/kube-scheduler v0.30.6
29-
k8s.io/kubernetes v1.30.6
30-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
31-
sigs.k8s.io/controller-runtime v0.18.5
19+
k8s.io/api v0.31.2
20+
k8s.io/apimachinery v0.31.2
21+
k8s.io/apiserver v0.31.2
22+
k8s.io/client-go v0.31.2
23+
k8s.io/code-generator v0.31.2
24+
k8s.io/component-base v0.31.2
25+
k8s.io/component-helpers v0.31.2
26+
k8s.io/klog/v2 v2.130.1
27+
k8s.io/kube-scheduler v0.31.2
28+
k8s.io/kubernetes v1.31.2
29+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
30+
sigs.k8s.io/controller-runtime v0.19.2
31+
sigs.k8s.io/logtools v0.9.0
3232
sigs.k8s.io/security-profiles-operator v0.4.0
3333
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
34-
sigs.k8s.io/yaml v1.3.0
34+
sigs.k8s.io/yaml v1.4.0
3535
)
3636

3737
require (
3838
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
3939
github.com/NYTimes/gziphandler v1.1.1 // indirect
4040
github.com/OneOfOne/xxhash v1.2.8 // indirect
41-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
41+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
4242
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
4343
github.com/beorn7/perks v1.0.1 // indirect
4444
github.com/blang/semver/v4 v4.0.0 // indirect
45-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
46-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
45+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
46+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4747
github.com/coreos/go-semver v0.3.1 // indirect
4848
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4949
github.com/crossplane/crossplane-runtime v0.14.1-0.20210713194031-85b19c28ea88 // indirect
50-
github.com/davecgh/go-spew v1.1.1 // indirect
50+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5151
github.com/distribution/reference v0.5.0 // indirect
5252
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5353
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5454
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
55-
github.com/felixge/httpsnoop v1.0.3 // indirect
55+
github.com/felixge/httpsnoop v1.0.4 // indirect
5656
github.com/francoispqt/gojay v1.2.13 // indirect
5757
github.com/fsnotify/fsnotify v1.7.0 // indirect
58+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5859
github.com/go-logr/stdr v1.2.2 // indirect
5960
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6061
github.com/go-openapi/jsonreference v0.20.2 // indirect
61-
github.com/go-openapi/swag v0.22.3 // indirect
62+
github.com/go-openapi/swag v0.22.4 // indirect
63+
github.com/godbus/dbus/v5 v5.1.0 // indirect
6264
github.com/gogo/protobuf v1.3.2 // indirect
6365
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6466
github.com/golang/protobuf v1.5.4 // indirect
65-
github.com/google/cel-go v0.17.8 // indirect
67+
github.com/google/cel-go v0.20.1 // indirect
6668
github.com/google/gnostic-models v0.6.8 // indirect
6769
github.com/google/gofuzz v1.2.0 // indirect
68-
github.com/google/uuid v1.3.1 // indirect
70+
github.com/google/uuid v1.6.0 // indirect
6971
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
70-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
72+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
7173
github.com/imdario/mergo v0.3.12 // indirect
7274
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7375
github.com/josharian/intern v1.0.0 // indirect
7476
github.com/jpillora/backoff v1.0.0 // indirect
7577
github.com/json-iterator/go v1.1.12 // indirect
7678
github.com/mailru/easyjson v0.7.7 // indirect
77-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
78-
github.com/moby/sys/mountinfo v0.6.2 // indirect
79-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
79+
github.com/moby/sys/mountinfo v0.7.1 // indirect
80+
github.com/moby/term v0.5.0 // indirect
8081
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8182
github.com/modern-go/reflect2 v1.0.2 // indirect
8283
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8384
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
8485
github.com/opencontainers/go-digest v1.0.0 // indirect
86+
github.com/opencontainers/runc v1.1.13 // indirect
8587
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect
8688
github.com/opencontainers/selinux v1.11.0 // indirect
8789
github.com/pkg/errors v0.9.1 // indirect
88-
github.com/pmezard/go-difflib v1.0.0 // indirect
89-
github.com/prometheus/client_golang v1.16.0 // indirect
90-
github.com/prometheus/client_model v0.4.0 // indirect
91-
github.com/prometheus/common v0.44.0 // indirect
92-
github.com/prometheus/procfs v0.12.0 // indirect
90+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
91+
github.com/prometheus/client_golang v1.19.1 // indirect
92+
github.com/prometheus/client_model v0.6.1 // indirect
93+
github.com/prometheus/common v0.55.0 // indirect
94+
github.com/prometheus/procfs v0.15.1 // indirect
9395
github.com/seccomp/libseccomp-golang v0.10.0 // indirect
94-
github.com/sirupsen/logrus v1.9.0 // indirect
95-
github.com/spf13/cobra v1.7.0 // indirect
96-
github.com/stoewer/go-strcase v1.2.0 // indirect
97-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
98-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
99-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
100-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
101-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
102-
go.opentelemetry.io/otel v1.21.0 // indirect
103-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
104-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
105-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
106-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
107-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
108-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
96+
github.com/sirupsen/logrus v1.9.3 // indirect
97+
github.com/spf13/cobra v1.8.1 // indirect
98+
github.com/stoewer/go-strcase v1.3.0 // indirect
99+
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
103+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
104+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
105+
go.opentelemetry.io/otel v1.28.0 // indirect
106+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
107+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
108+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
109+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
110+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
111+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
109112
go.uber.org/multierr v1.11.0 // indirect
110113
go.uber.org/zap v1.26.0 // indirect
111-
golang.org/x/crypto v0.21.0 // indirect
112-
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
113-
golang.org/x/mod v0.15.0 // indirect
114-
golang.org/x/net v0.23.0 // indirect
115-
golang.org/x/oauth2 v0.12.0 // indirect
116-
golang.org/x/sync v0.6.0 // indirect
117-
golang.org/x/sys v0.18.0 // indirect
118-
golang.org/x/term v0.18.0 // indirect
119-
golang.org/x/text v0.14.0 // indirect
120-
golang.org/x/time v0.3.0 // indirect
121-
golang.org/x/tools v0.18.0 // indirect
114+
golang.org/x/crypto v0.24.0 // indirect
115+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
116+
golang.org/x/mod v0.17.0 // indirect
117+
golang.org/x/net v0.26.0 // indirect
118+
golang.org/x/oauth2 v0.21.0 // indirect
119+
golang.org/x/sync v0.7.0 // indirect
120+
golang.org/x/sys v0.21.0 // indirect
121+
golang.org/x/term v0.21.0 // indirect
122+
golang.org/x/text v0.16.0 // indirect
123+
golang.org/x/time v0.5.0 // indirect
124+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
122125
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
123-
google.golang.org/appengine v1.6.7 // indirect
124-
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
125-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
126-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
127-
google.golang.org/grpc v1.59.0 // indirect
128-
google.golang.org/protobuf v1.33.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
128+
google.golang.org/grpc v1.65.0 // indirect
129+
google.golang.org/protobuf v1.34.2 // indirect
130+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
129131
gopkg.in/inf.v0 v0.9.1 // indirect
130132
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
131133
gopkg.in/yaml.v2 v2.4.0 // indirect
132134
gopkg.in/yaml.v3 v3.0.1 // indirect
133-
k8s.io/apiextensions-apiserver v0.30.6 // indirect
134-
k8s.io/cloud-provider v0.30.6 // indirect
135-
k8s.io/controller-manager v0.30.6 // indirect
136-
k8s.io/csi-translation-lib v0.30.6 // indirect
137-
k8s.io/dynamic-resource-allocation v0.30.6 // indirect
135+
k8s.io/apiextensions-apiserver v0.31.2 // indirect
136+
k8s.io/cloud-provider v0.31.2 // indirect
137+
k8s.io/controller-manager v0.31.2 // indirect
138+
k8s.io/csi-translation-lib v0.31.2 // indirect
139+
k8s.io/dynamic-resource-allocation v0.31.2 // indirect
138140
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
139-
k8s.io/kms v0.30.6 // indirect
141+
k8s.io/kms v0.31.2 // indirect
140142
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
141-
k8s.io/kubelet v0.30.6 // indirect
142-
k8s.io/metrics v0.30.6 // indirect
143-
k8s.io/mount-utils v0.30.6 // indirect
144-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
143+
k8s.io/kubelet v0.31.2 // indirect
144+
k8s.io/metrics v0.31.2 // indirect
145+
k8s.io/mount-utils v0.31.2 // indirect
146+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
145147
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
146148
sigs.k8s.io/release-utils v0.3.0 // indirect
147149
)
148150

149151
replace (
150-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0
151-
go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.21.0
152-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0
153-
go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.21.0
154-
go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.21.0
155-
go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.21.0
156-
k8s.io/api => k8s.io/api v0.30.6
157-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.6
158-
k8s.io/apimachinery => k8s.io/apimachinery v0.30.6
159-
k8s.io/apiserver => k8s.io/apiserver v0.30.6
160-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.6
161-
k8s.io/client-go => k8s.io/client-go v0.30.6
162-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.6
163-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.6
164-
k8s.io/code-generator => k8s.io/code-generator v0.30.6
165-
k8s.io/component-base => k8s.io/component-base v0.30.6
166-
k8s.io/component-helpers => k8s.io/component-helpers v0.30.6
167-
k8s.io/controller-manager => k8s.io/controller-manager v0.30.6
168-
k8s.io/cri-api => k8s.io/cri-api v0.30.6
169-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.6
170-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.6
171-
k8s.io/endpointslice => k8s.io/endpointslice v0.30.6
172-
k8s.io/kms => k8s.io/kms v0.30.6
173-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.6
174-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.6
175-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.6
176-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.6
177-
k8s.io/kubectl => k8s.io/kubectl v0.30.6
178-
k8s.io/kubelet => k8s.io/kubelet v0.30.6
179-
k8s.io/kubernetes => k8s.io/kubernetes v1.30.6
180-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.6
181-
k8s.io/metrics => k8s.io/metrics v0.30.6
182-
k8s.io/mount-utils => k8s.io/mount-utils v0.30.6
183-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.6
184-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.6
152+
k8s.io/api => k8s.io/api v0.31.2
153+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.2
154+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.2
155+
k8s.io/apiserver => k8s.io/apiserver v0.31.2
156+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.2
157+
k8s.io/client-go => k8s.io/client-go v0.31.2
158+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.2
159+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.2
160+
k8s.io/code-generator => k8s.io/code-generator v0.31.2
161+
k8s.io/component-base => k8s.io/component-base v0.31.2
162+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.2
163+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.2
164+
k8s.io/cri-api => k8s.io/cri-api v0.31.2
165+
k8s.io/cri-client => k8s.io/cri-client v0.31.2
166+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.2
167+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.2
168+
k8s.io/endpointslice => k8s.io/endpointslice v0.31.2
169+
k8s.io/kms => k8s.io/kms v0.31.2
170+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.2
171+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.2
172+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.2
173+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.2
174+
k8s.io/kubectl => k8s.io/kubectl v0.31.2
175+
k8s.io/kubelet => k8s.io/kubelet v0.31.2
176+
k8s.io/kubernetes => k8s.io/kubernetes v1.31.2
177+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.2
178+
k8s.io/metrics => k8s.io/metrics v0.31.2
179+
k8s.io/mount-utils => k8s.io/mount-utils v0.31.2
180+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.2
181+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.2
185182
)

0 commit comments

Comments
 (0)