Skip to content

Commit f15a08a

Browse files
authored
Merge pull request #8483 from adrianmoisey/bump-vpa-deps
Bump VPA dependencies for Kubernetes 1.34
2 parents b8f910f + efc9a31 commit f15a08a

File tree

6 files changed

+476
-454
lines changed

6 files changed

+476
-454
lines changed

vertical-pod-autoscaler/e2e/go.mod

Lines changed: 120 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -8,68 +8,69 @@ go 1.24.0
88
toolchain go1.24.2
99

1010
require (
11-
github.com/onsi/ginkgo/v2 v2.22.0
12-
github.com/onsi/gomega v1.36.1
13-
k8s.io/api v0.33.0
14-
k8s.io/apimachinery v0.33.0
15-
k8s.io/autoscaler/vertical-pod-autoscaler v1.3.0
16-
k8s.io/client-go v0.33.0
17-
k8s.io/component-base v0.33.0
11+
github.com/onsi/ginkgo/v2 v2.25.1
12+
github.com/onsi/gomega v1.38.2
13+
k8s.io/api v0.34.0
14+
k8s.io/apimachinery v0.34.0
15+
k8s.io/autoscaler/vertical-pod-autoscaler v1.4.1
16+
k8s.io/client-go v1.5.2
17+
k8s.io/component-base v0.34.0
1818
k8s.io/klog/v2 v2.130.1
19-
k8s.io/kubernetes v1.33.0
20-
k8s.io/pod-security-admission v0.33.0
21-
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
19+
k8s.io/kubernetes v1.34.0
20+
k8s.io/pod-security-admission v0.34.0
21+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
2222
)
2323

2424
require (
25-
cel.dev/expr v0.19.1 // indirect
25+
cel.dev/expr v0.24.0 // indirect
2626
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
27+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2728
github.com/Microsoft/go-winio v0.6.2 // indirect
28-
github.com/Microsoft/hnslib v0.0.8 // indirect
29+
github.com/Microsoft/hnslib v0.1.1 // indirect
2930
github.com/NYTimes/gziphandler v1.1.1 // indirect
30-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
31+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
3132
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
3233
github.com/beorn7/perks v1.0.1 // indirect
3334
github.com/blang/semver/v4 v4.0.0 // indirect
34-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
35+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3536
github.com/cespare/xxhash/v2 v2.3.0 // indirect
36-
github.com/container-storage-interface/spec v1.9.0 // indirect
37-
github.com/containerd/containerd/api v1.8.0 // indirect
37+
github.com/container-storage-interface/spec v1.11.0 // indirect
38+
github.com/containerd/containerd/api v1.9.0 // indirect
3839
github.com/containerd/errdefs v1.0.0 // indirect
3940
github.com/containerd/errdefs/pkg v0.3.0 // indirect
4041
github.com/containerd/log v0.1.0 // indirect
41-
github.com/containerd/ttrpc v1.2.6 // indirect
42-
github.com/containerd/typeurl/v2 v2.2.2 // indirect
42+
github.com/containerd/ttrpc v1.2.7 // indirect
43+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
4344
github.com/coreos/go-semver v0.3.1 // indirect
44-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
45+
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
4546
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
4647
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4748
github.com/distribution/reference v0.6.0 // indirect
4849
github.com/docker/go-units v0.5.0 // indirect
49-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
50+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
5051
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
5152
github.com/felixge/httpsnoop v1.0.4 // indirect
5253
github.com/fsnotify/fsnotify v1.9.0 // indirect
53-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
54-
github.com/go-logr/logr v1.4.2 // indirect
54+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
55+
github.com/go-logr/logr v1.4.3 // indirect
5556
github.com/go-logr/stdr v1.2.2 // indirect
56-
github.com/go-openapi/jsonpointer v0.21.1 // indirect
57+
github.com/go-openapi/jsonpointer v0.21.2 // indirect
5758
github.com/go-openapi/jsonreference v0.21.0 // indirect
5859
github.com/go-openapi/swag v0.23.1 // indirect
5960
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6061
github.com/godbus/dbus/v5 v5.1.0 // indirect
6162
github.com/gogo/protobuf v1.3.2 // indirect
6263
github.com/golang/protobuf v1.5.4 // indirect
6364
github.com/google/btree v1.1.3 // indirect
64-
github.com/google/cadvisor v0.52.1 // indirect
65-
github.com/google/cel-go v0.23.2 // indirect
66-
github.com/google/gnostic-models v0.6.9 // indirect
65+
github.com/google/cadvisor v0.53.0 // indirect
66+
github.com/google/cel-go v0.26.1 // indirect
67+
github.com/google/gnostic-models v0.7.0 // indirect
6768
github.com/google/go-cmp v0.7.0 // indirect
68-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
69+
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
6970
github.com/google/uuid v1.6.0 // indirect
7071
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
7172
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
72-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
73+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
7374
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7475
github.com/josharian/intern v1.0.0 // indirect
7576
github.com/json-iterator/go v1.1.12 // indirect
@@ -81,116 +82,118 @@ require (
8182
github.com/moby/sys/mountinfo v0.7.2 // indirect
8283
github.com/moby/sys/userns v0.1.0 // indirect
8384
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
84-
github.com/modern-go/reflect2 v1.0.2 // indirect
85+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8586
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8687
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
87-
github.com/opencontainers/cgroups v0.0.1 // indirect
88+
github.com/opencontainers/cgroups v0.0.4 // indirect
8889
github.com/opencontainers/go-digest v1.0.0 // indirect
8990
github.com/opencontainers/image-spec v1.1.1 // indirect
90-
github.com/opencontainers/runtime-spec v1.2.0 // indirect
91-
github.com/opencontainers/selinux v1.11.1 // indirect
92-
github.com/pkg/errors v0.9.1 // indirect
91+
github.com/opencontainers/runtime-spec v1.2.1 // indirect
92+
github.com/opencontainers/selinux v1.12.0 // indirect
9393
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
94-
github.com/prometheus/client_golang v1.22.0 // indirect
94+
github.com/prometheus/client_golang v1.23.0 // indirect
9595
github.com/prometheus/client_model v0.6.2 // indirect
96-
github.com/prometheus/common v0.63.0 // indirect
97-
github.com/prometheus/procfs v0.16.1 // indirect
96+
github.com/prometheus/common v0.65.0 // indirect
97+
github.com/prometheus/procfs v0.17.0 // indirect
9898
github.com/sirupsen/logrus v1.9.3 // indirect
9999
github.com/spf13/cobra v1.9.1 // indirect
100-
github.com/spf13/pflag v1.0.6 // indirect
101-
github.com/stoewer/go-strcase v1.3.0 // indirect
100+
github.com/spf13/pflag v1.0.7 // indirect
101+
github.com/stoewer/go-strcase v1.3.1 // indirect
102102
github.com/stretchr/objx v0.5.2 // indirect
103-
github.com/stretchr/testify v1.10.0 // indirect
103+
github.com/stretchr/testify v1.11.1 // indirect
104104
github.com/x448/float16 v0.8.4 // indirect
105-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
106-
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
107-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
105+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
106+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
107+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
108108
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
109-
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.58.0 // indirect
110-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
111-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
112-
go.opentelemetry.io/otel v1.35.0 // indirect
113-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
114-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
115-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
116-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
117-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
118-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
109+
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.62.0 // indirect
110+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 // indirect
111+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
112+
go.opentelemetry.io/otel v1.37.0 // indirect
113+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
114+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
115+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
116+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
117+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
118+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
119+
go.uber.org/automaxprocs v1.6.0 // indirect
119120
go.uber.org/multierr v1.11.0 // indirect
120121
go.uber.org/zap v1.27.0 // indirect
121-
golang.org/x/crypto v0.37.0 // indirect
122-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
123-
golang.org/x/net v0.39.0 // indirect
124-
golang.org/x/oauth2 v0.29.0 // indirect
125-
golang.org/x/sync v0.13.0 // indirect
126-
golang.org/x/sys v0.32.0 // indirect
127-
golang.org/x/term v0.31.0 // indirect
128-
golang.org/x/text v0.24.0 // indirect
129-
golang.org/x/time v0.11.0 // indirect
130-
golang.org/x/tools v0.28.0 // indirect
131-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
132-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
133-
google.golang.org/grpc v1.68.1 // indirect
134-
google.golang.org/protobuf v1.36.6 // indirect
135-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
122+
go.yaml.in/yaml/v2 v2.4.2 // indirect
123+
go.yaml.in/yaml/v3 v3.0.4 // indirect
124+
golang.org/x/crypto v0.41.0 // indirect
125+
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect
126+
golang.org/x/net v0.43.0 // indirect
127+
golang.org/x/oauth2 v0.30.0 // indirect
128+
golang.org/x/sync v0.16.0 // indirect
129+
golang.org/x/sys v0.35.0 // indirect
130+
golang.org/x/term v0.34.0 // indirect
131+
golang.org/x/text v0.28.0 // indirect
132+
golang.org/x/time v0.12.0 // indirect
133+
golang.org/x/tools v0.36.0 // indirect
134+
google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 // indirect
135+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
136+
google.golang.org/grpc v1.75.0 // indirect
137+
google.golang.org/protobuf v1.36.8 // indirect
138+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
136139
gopkg.in/inf.v0 v0.9.1 // indirect
137140
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
138141
gopkg.in/yaml.v3 v3.0.1 // indirect
139-
k8s.io/apiextensions-apiserver v0.0.0 // indirect
140-
k8s.io/apiserver v0.33.0 // indirect
141-
k8s.io/cloud-provider v0.32.0 // indirect
142-
k8s.io/component-helpers v0.33.0 // indirect
143-
k8s.io/controller-manager v0.33.0 // indirect
144-
k8s.io/cri-api v0.33.0 // indirect
145-
k8s.io/cri-client v0.32.0 // indirect
146-
k8s.io/csi-translation-lib v0.26.1 // indirect
147-
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
148-
k8s.io/kms v0.33.0 // indirect
149-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
150-
k8s.io/kube-scheduler v0.0.0 // indirect
151-
k8s.io/kubectl v0.0.0 // indirect
152-
k8s.io/kubelet v0.33.0 // indirect
153-
k8s.io/mount-utils v0.25.0 // indirect
154-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
155-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
142+
k8s.io/apiextensions-apiserver v0.34.0 // indirect
143+
k8s.io/apiserver v0.34.0 // indirect
144+
k8s.io/cloud-provider v0.34.0 // indirect
145+
k8s.io/component-helpers v0.34.0 // indirect
146+
k8s.io/controller-manager v0.34.0 // indirect
147+
k8s.io/cri-api v0.34.0 // indirect
148+
k8s.io/cri-client v0.34.0 // indirect
149+
k8s.io/csi-translation-lib v0.34.0 // indirect
150+
k8s.io/dynamic-resource-allocation v0.34.0 // indirect
151+
k8s.io/kms v0.34.0 // indirect
152+
k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 // indirect
153+
k8s.io/kube-scheduler v0.34.0 // indirect
154+
k8s.io/kubectl v0.34.0 // indirect
155+
k8s.io/kubelet v0.34.0 // indirect
156+
k8s.io/mount-utils v0.34.0 // indirect
157+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
158+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
156159
sigs.k8s.io/randfill v1.0.0 // indirect
157-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
158-
sigs.k8s.io/yaml v1.4.0 // indirect
160+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
161+
sigs.k8s.io/yaml v1.6.0 // indirect
159162
)
160163

161164
replace (
162-
k8s.io/api => k8s.io/api v0.33.0
163-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.0
164-
k8s.io/apimachinery => k8s.io/apimachinery v0.33.0
165-
k8s.io/apiserver => k8s.io/apiserver v0.33.0
165+
k8s.io/api => k8s.io/api v0.34.0
166+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.0
167+
k8s.io/apimachinery => k8s.io/apimachinery v0.34.0
168+
k8s.io/apiserver => k8s.io/apiserver v0.34.0
166169
k8s.io/autoscaler => ../../
167170
k8s.io/autoscaler/vertical-pod-autoscaler => ../
168-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.0
169-
k8s.io/client-go => k8s.io/client-go v0.33.0
170-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.0
171-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.0
172-
k8s.io/code-generator => k8s.io/code-generator v0.33.0
173-
k8s.io/component-base => k8s.io/component-base v0.33.0
174-
k8s.io/component-helpers => k8s.io/component-helpers v0.33.0
175-
k8s.io/controller-manager => k8s.io/controller-manager v0.33.0
176-
k8s.io/cri-api => k8s.io/cri-api v0.33.0
177-
k8s.io/cri-client => k8s.io/cri-client v0.33.0
178-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.0
179-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.0
180-
k8s.io/endpointslice => k8s.io/endpointslice v0.33.0
181-
k8s.io/kms => k8s.io/kms v0.33.0
182-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.0
183-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.0
184-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.0
185-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.0
186-
k8s.io/kubectl => k8s.io/kubectl v0.33.0
187-
k8s.io/kubelet => k8s.io/kubelet v0.33.0
188-
k8s.io/metrics => k8s.io/metrics v0.33.0
189-
k8s.io/mount-utils => k8s.io/mount-utils v0.33.0
190-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.0
191-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.0
192-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.33.0
193-
k8s.io/sample-controller => k8s.io/sample-controller v0.33.0
171+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.0
172+
k8s.io/client-go => k8s.io/client-go v0.34.0
173+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.0
174+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.0
175+
k8s.io/code-generator => k8s.io/code-generator v0.34.0
176+
k8s.io/component-base => k8s.io/component-base v0.34.0
177+
k8s.io/component-helpers => k8s.io/component-helpers v0.34.0
178+
k8s.io/controller-manager => k8s.io/controller-manager v0.34.0
179+
k8s.io/cri-api => k8s.io/cri-api v0.34.0
180+
k8s.io/cri-client => k8s.io/cri-client v0.34.0
181+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.0
182+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.0
183+
k8s.io/endpointslice => k8s.io/endpointslice v0.34.0
184+
k8s.io/kms => k8s.io/kms v0.34.0
185+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.0
186+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.0
187+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.0
188+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.0
189+
k8s.io/kubectl => k8s.io/kubectl v0.34.0
190+
k8s.io/kubelet => k8s.io/kubelet v0.34.0
191+
k8s.io/metrics => k8s.io/metrics v0.34.0
192+
k8s.io/mount-utils => k8s.io/mount-utils v0.34.0
193+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.0
194+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.0
195+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.34.0
196+
k8s.io/sample-controller => k8s.io/sample-controller v0.34.0
194197
)
195198

196-
replace k8s.io/externaljwt => k8s.io/externaljwt v0.33.0
199+
replace k8s.io/externaljwt => k8s.io/externaljwt v0.34.0

0 commit comments

Comments
 (0)