Skip to content

Commit 2a7543b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #8581 from k8s-infra-cherrypick-robot/cherry-pick-8579-to-vpa-release-1.5
[vpa-release-1.5] vertical-pod-autoscaler: Fix the `k8s.io/client-go` version
2 parents 8c5b567 + 0806b42 commit 2a7543b

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎vertical-pod-autoscaler/e2e/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
k8s.io/api v0.34.0
1414
k8s.io/apimachinery v0.34.0
1515
k8s.io/autoscaler/vertical-pod-autoscaler v1.4.1
16-
k8s.io/client-go v1.5.2
16+
k8s.io/client-go v0.34.0
1717
k8s.io/component-base v0.34.0
1818
k8s.io/klog/v2 v2.130.1
1919
k8s.io/kubernetes v1.34.0
@@ -164,7 +164,7 @@ require (
164164
replace (
165165
k8s.io/api => k8s.io/api v0.34.0
166166
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.0
167-
k8s.io/apimachinery => k8s.io/apimachinery v0.34.0
167+
k8s.io/apimachinery => k8s.io/apimachinery v0.34.1
168168
k8s.io/apiserver => k8s.io/apiserver v0.34.0
169169
k8s.io/autoscaler => ../../
170170
k8s.io/autoscaler/vertical-pod-autoscaler => ../
@@ -176,7 +176,7 @@ replace (
176176
k8s.io/component-base => k8s.io/component-base v0.34.0
177177
k8s.io/component-helpers => k8s.io/component-helpers v0.34.0
178178
k8s.io/controller-manager => k8s.io/controller-manager v0.34.0
179-
k8s.io/cri-api => k8s.io/cri-api v0.34.0
179+
k8s.io/cri-api => k8s.io/cri-api v0.34.1
180180
k8s.io/cri-client => k8s.io/cri-client v0.34.0
181181
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.0
182182
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.0
@@ -189,11 +189,11 @@ replace (
189189
k8s.io/kubectl => k8s.io/kubectl v0.34.0
190190
k8s.io/kubelet => k8s.io/kubelet v0.34.0
191191
k8s.io/metrics => k8s.io/metrics v0.34.0
192-
k8s.io/mount-utils => k8s.io/mount-utils v0.34.0
192+
k8s.io/mount-utils => k8s.io/mount-utils v0.34.1
193193
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.0
194194
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.0
195195
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.34.0
196196
k8s.io/sample-controller => k8s.io/sample-controller v0.34.0
197197
)
198198

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

‎vertical-pod-autoscaler/e2e/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE=
350350
k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug=
351351
k8s.io/apiextensions-apiserver v0.34.0 h1:B3hiB32jV7BcyKcMU5fDaDxk882YrJ1KU+ZSkA9Qxoc=
352352
k8s.io/apiextensions-apiserver v0.34.0/go.mod h1:hLI4GxE1BDBy9adJKxUxCEHBGZtGfIg98Q+JmTD7+g0=
353-
k8s.io/apimachinery v0.34.0 h1:eR1WO5fo0HyoQZt1wdISpFDffnWOvFLOOeJ7MgIv4z0=
354-
k8s.io/apimachinery v0.34.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
353+
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
354+
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
355355
k8s.io/apiserver v0.34.0 h1:Z51fw1iGMqN7uJ1kEaynf2Aec1Y774PqU+FVWCFV3Jg=
356356
k8s.io/apiserver v0.34.0/go.mod h1:52ti5YhxAvewmmpVRqlASvaqxt0gKJxvCeW7ZrwgazQ=
357357
k8s.io/client-go v0.34.0 h1:YoWv5r7bsBfb0Hs2jh8SOvFbKzzxyNo0nSb0zC19KZo=
@@ -364,8 +364,8 @@ k8s.io/component-helpers v0.34.0 h1:5T7P9XGMoUy1JDNKzHf0p/upYbeUf8ZaSf9jbx0QlIo=
364364
k8s.io/component-helpers v0.34.0/go.mod h1:kaOyl5tdtnymriYcVZg4uwDBe2d1wlIpXyDkt6sVnt4=
365365
k8s.io/controller-manager v0.34.0 h1:oCHoqS8dcFp7zDSu7HUvTpakq3isSxil3GprGGlJMsE=
366366
k8s.io/controller-manager v0.34.0/go.mod h1:XFto21U+Mm9BT8r/Jd5E4tHCGtwjKAUFOuDcqaj2VK0=
367-
k8s.io/cri-api v0.34.0 h1:erzXelLqzDbNdryR7eVqxmR/1JfQeurE9U+HdKTgSpU=
368-
k8s.io/cri-api v0.34.0/go.mod h1:4qVUjidMg7/Z9YGZpqIDygbkPWkg3mkS1PvOx/kpHTE=
367+
k8s.io/cri-api v0.34.1 h1:n2bU++FqqJq0CNjP/5pkOs0nIx7aNpb1Xa053TecQkM=
368+
k8s.io/cri-api v0.34.1/go.mod h1:4qVUjidMg7/Z9YGZpqIDygbkPWkg3mkS1PvOx/kpHTE=
369369
k8s.io/cri-client v0.34.0 h1:tLZro2oYinVKS5CaMtCASLmOacqVlwoHPSs9e7sBFWI=
370370
k8s.io/cri-client v0.34.0/go.mod h1:KkGaUJWMvCdpSTf15Wiqtf3WKl3qjcvkBcMApPCqpxQ=
371371
k8s.io/csi-translation-lib v0.34.0 h1:WhCkq35XATZ+x6NKqI4u7XSYtmucuCN7jDk+mmm9XUU=
@@ -386,8 +386,8 @@ k8s.io/kubelet v0.34.0 h1:1nZt1Q6Kfx7xCaTS9vnqR9sjZDxf3cRSQkAFCczULmc=
386386
k8s.io/kubelet v0.34.0/go.mod h1:NqbF8ViVettlZbf9hw9DJhubaWn7rGvDDTcLMDm6tQ0=
387387
k8s.io/kubernetes v1.34.0 h1:NvUrwPAVB4W3mSOpJ/RtNGHWWYyUP/xPaX5rUSpzA0w=
388388
k8s.io/kubernetes v1.34.0/go.mod h1:iu+FhII+Oc/1gGWLJcer6wpyih441aNFHl7Pvm8yPto=
389-
k8s.io/mount-utils v0.34.0 h1:f2QzKU8ZLz5cJ/TmRRZnfAVJ8EPsF+FT1I6pP/HA4gk=
390-
k8s.io/mount-utils v0.34.0/go.mod h1:MIjjYlqJ0ziYQg0MO09kc9S96GIcMkhF/ay9MncF0GA=
389+
k8s.io/mount-utils v0.34.1 h1:zMBEFav8Rxwm54S8srzy5FxAc4KQ3X4ZcjnqTCzHmZk=
390+
k8s.io/mount-utils v0.34.1/go.mod h1:MIjjYlqJ0ziYQg0MO09kc9S96GIcMkhF/ay9MncF0GA=
391391
k8s.io/pod-security-admission v0.34.0 h1:4AOTPSDttUeAX7czodeHK1jjBxWBMElU7e5VVzJAeJw=
392392
k8s.io/pod-security-admission v0.34.0/go.mod h1:ICOx2MB6W7ZEjfIOJ5NuJFfMFZbeXWgxOmz08Ox51iQ=
393393
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d h1:wAhiDyZ4Tdtt7e46e9M5ZSAJ/MnPGPs+Ki1gHw4w1R0=

‎vertical-pod-autoscaler/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
golang.org/x/time v0.12.0
1515
k8s.io/api v0.34.0
1616
k8s.io/apimachinery v0.34.0
17-
k8s.io/client-go v1.5.2
17+
k8s.io/client-go v0.34.0
1818
k8s.io/code-generator v0.34.0
1919
k8s.io/component-base v0.34.0
2020
k8s.io/klog/v2 v2.130.1
@@ -79,7 +79,7 @@ require (
7979
replace (
8080
k8s.io/api => k8s.io/api v0.34.0
8181
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.0
82-
k8s.io/apimachinery => k8s.io/apimachinery v0.34.0
82+
k8s.io/apimachinery => k8s.io/apimachinery v0.34.1
8383
k8s.io/apiserver => k8s.io/apiserver v0.34.0
8484
k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.0
8585
k8s.io/client-go => k8s.io/client-go v0.34.0
@@ -89,7 +89,7 @@ replace (
8989
k8s.io/component-base => k8s.io/component-base v0.34.0
9090
k8s.io/component-helpers => k8s.io/component-helpers v0.34.0
9191
k8s.io/controller-manager => k8s.io/controller-manager v0.34.0
92-
k8s.io/cri-api => k8s.io/cri-api v0.34.0
92+
k8s.io/cri-api => k8s.io/cri-api v0.34.1
9393
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.0
9494
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.0
9595
k8s.io/endpointslice => k8s.io/endpointslice v0.34.0
@@ -101,7 +101,7 @@ replace (
101101
k8s.io/kubectl => k8s.io/kubectl v0.34.0
102102
k8s.io/kubelet => k8s.io/kubelet v0.34.0
103103
k8s.io/metrics => k8s.io/metrics v0.34.0
104-
k8s.io/mount-utils => k8s.io/mount-utils v0.34.0
104+
k8s.io/mount-utils => k8s.io/mount-utils v0.34.1
105105
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.0
106106
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.0
107107
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.34.0
@@ -110,4 +110,4 @@ replace (
110110

111111
replace k8s.io/cri-client => k8s.io/cri-client v0.34.0
112112

113-
replace k8s.io/externaljwt => k8s.io/externaljwt v0.34.0
113+
replace k8s.io/externaljwt => k8s.io/externaljwt v0.34.1

‎vertical-pod-autoscaler/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
173173
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
174174
k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE=
175175
k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug=
176-
k8s.io/apimachinery v0.34.0 h1:eR1WO5fo0HyoQZt1wdISpFDffnWOvFLOOeJ7MgIv4z0=
177-
k8s.io/apimachinery v0.34.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
176+
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
177+
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
178178
k8s.io/client-go v0.34.0 h1:YoWv5r7bsBfb0Hs2jh8SOvFbKzzxyNo0nSb0zC19KZo=
179179
k8s.io/client-go v0.34.0/go.mod h1:ozgMnEKXkRjeMvBZdV1AijMHLTh3pbACPvK7zFR+QQY=
180180
k8s.io/code-generator v0.34.0 h1:Ze2i1QsvUprIlX3oHiGv09BFQRLCz+StA8qKwwFzees=

‎vertical-pod-autoscaler/hack/update-kubernetes-deps.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
set -euo pipefail
2323

24-
K8S_TAG=${K8S_TAG:-v1.33.0}
24+
K8S_TAG=${K8S_TAG:-v1.34.0}
2525
K8S_TAG=${K8S_TAG#v}
2626
K8S_FORK="git@github.com:kubernetes/kubernetes.git"
2727

0 commit comments

Comments
 (0)