Skip to content

Commit ef06f19

Browse files
muddyfishmuddyfish
committed
Switch k8s to 1.33.6
1 parent 91accee commit ef06f19

3 files changed

Lines changed: 114 additions & 5 deletions

File tree

‎tests/e2e-kubernetes/go.mod‎

Lines changed: 67 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
k8s.io/api v0.36.0
1616
k8s.io/apimachinery v0.36.0
1717
k8s.io/client-go v0.36.0
18-
k8s.io/kubernetes v1.31.6
18+
k8s.io/kubernetes v1.33.6
1919
k8s.io/pod-security-admission v0.31.3
2020
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5
2121
)
@@ -75,7 +75,7 @@ require (
7575
github.com/coreos/go-semver v0.3.1 // indirect
7676
github.com/coreos/go-systemd/v22 v22.7.0 // indirect
7777
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
78-
github.com/distribution/reference v0.5.0 // indirect
78+
github.com/distribution/reference v0.6.0 // indirect
7979
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
8080
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
8181
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -103,7 +103,7 @@ require (
103103
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
104104
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
105105
github.com/opencontainers/go-digest v1.0.0 // indirect
106-
github.com/opencontainers/selinux v1.11.0 // indirect
106+
github.com/opencontainers/selinux v1.11.1 // indirect
107107
github.com/prometheus/client_golang v1.23.2 // indirect
108108
github.com/prometheus/client_model v0.6.2 // indirect
109109
github.com/prometheus/common v0.67.5 // indirect
@@ -149,8 +149,8 @@ require (
149149
k8s.io/apiserver v0.36.0 // indirect
150150
k8s.io/cloud-provider v0.31.3 // indirect
151151
k8s.io/component-base v0.36.0 // indirect
152-
k8s.io/component-helpers v0.31.3 // indirect
153-
k8s.io/controller-manager v0.31.3 // indirect
152+
k8s.io/component-helpers v0.33.6 // indirect
153+
k8s.io/controller-manager v0.33.6 // indirect
154154
k8s.io/csi-translation-lib v0.31.3 // indirect
155155
k8s.io/klog/v2 v2.140.0 // indirect
156156
k8s.io/kms v0.36.0 // indirect
@@ -163,3 +163,65 @@ require (
163163
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
164164
sigs.k8s.io/yaml v1.6.0 // indirect
165165
)
166+
167+
replace k8s.io/api => k8s.io/api v0.33.6
168+
169+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.6
170+
171+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.33.10
172+
173+
replace k8s.io/apiserver => k8s.io/apiserver v0.33.6
174+
175+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.6
176+
177+
replace k8s.io/client-go => k8s.io/client-go v0.33.6
178+
179+
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.6
180+
181+
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.6
182+
183+
replace k8s.io/code-generator => k8s.io/code-generator v0.33.6
184+
185+
replace k8s.io/component-base => k8s.io/component-base v0.33.6
186+
187+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.33.6
188+
189+
replace k8s.io/controller-manager => k8s.io/controller-manager v0.33.6
190+
191+
replace k8s.io/cri-api => k8s.io/cri-api v0.33.10
192+
193+
replace k8s.io/cri-client => k8s.io/cri-client v0.33.6
194+
195+
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.6
196+
197+
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.6
198+
199+
replace k8s.io/endpointslice => k8s.io/endpointslice v0.33.6
200+
201+
replace k8s.io/externaljwt => k8s.io/externaljwt v0.33.11
202+
203+
replace k8s.io/kms => k8s.io/kms v0.33.6
204+
205+
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.6
206+
207+
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.6
208+
209+
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.6
210+
211+
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.6
212+
213+
replace k8s.io/kubectl => k8s.io/kubectl v0.33.6
214+
215+
replace k8s.io/kubelet => k8s.io/kubelet v0.33.6
216+
217+
replace k8s.io/metrics => k8s.io/metrics v0.33.6
218+
219+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.33.10
220+
221+
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.6
222+
223+
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.6
224+
225+
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.33.6
226+
227+
replace k8s.io/sample-controller => k8s.io/sample-controller v0.33.6

‎tests/e2e-kubernetes/go.sum‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1
44
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
55
github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
66
github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
7+
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
78
github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
89
github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
910
github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
@@ -71,6 +72,7 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
7172
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7273
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
7374
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
75+
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
7476
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
7577
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
7678
github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes=
@@ -207,6 +209,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
207209
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
208210
github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU=
209211
github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
212+
github.com/opencontainers/selinux v1.11.1 h1:nHFvthhM0qY8/m+vfhJylliSshm8G1jJ2jDMcgULaH8=
213+
github.com/opencontainers/selinux v1.11.1/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
210214
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
211215
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
212216
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -380,42 +384,59 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
380384
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
381385
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
382386
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
387+
k8s.io/api v0.33.6/go.mod h1:bdon4pRFmRmdsFyltGIoCaPqutN7y//OQ4srD0uy9X0=
383388
k8s.io/api v0.36.0 h1:SgqDhZzHdOtMk40xVSvCXkP9ME0H05hPM3p9AB1kL80=
384389
k8s.io/api v0.36.0/go.mod h1:m1LVrGPNYax5NBHdO+QuAedXyuzTt4RryI/qnmNvs34=
390+
k8s.io/apiextensions-apiserver v0.33.6/go.mod h1:YUhU/Tb0GszjMK5BXb1HpP6+26TQ1xodhfntmZv7RC0=
385391
k8s.io/apiextensions-apiserver v0.36.0 h1:Wt7E8J+VBCbj4FjiBfDTK/neXDDjyJVJc7xfuOHImZ0=
386392
k8s.io/apiextensions-apiserver v0.36.0/go.mod h1:kGDjH0msuiIB3tgsYRV0kS9GqpMYMUsQ3GHv7TApyug=
393+
k8s.io/apimachinery v0.33.10/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
387394
k8s.io/apimachinery v0.36.0 h1:jZyPzhd5Z+3h9vJLt0z9XdzW9VzNzWAUw+P1xZ9PXtQ=
388395
k8s.io/apimachinery v0.36.0/go.mod h1:FklypaRJt6n5wUIwWXIP6GJlIpUizTgfo1T/As+Tyxc=
396+
k8s.io/apiserver v0.33.6/go.mod h1:5rRMAedHE4Vke25QGuW2kyfPIHC8nmQxNLdvJKAcmIU=
389397
k8s.io/apiserver v0.36.0 h1:Jg5OFAENUACByUCg15CmhZAYrr5ZyJ+jodyA1mHl3YE=
390398
k8s.io/apiserver v0.36.0/go.mod h1:mHvwdHf+qKEm+1/hYm756SV+oREOKSPnsjagOpx6Vho=
399+
k8s.io/client-go v0.33.6/go.mod h1:3z/Cwqdi6/Uo+E17k+OgQi4QfXS0XuIUmfHpK6rQdZU=
391400
k8s.io/client-go v0.36.0 h1:pOYi7C4RHChYjMiHpZSpSbIM6ZxVbRXBy7CuiIwqA3c=
392401
k8s.io/client-go v0.36.0/go.mod h1:ZKKcpwF0aLYfkHFCjillCKaTK/yBkEDHTDXCFY6AS9Y=
393402
k8s.io/cloud-provider v0.31.3 h1:7C3CHQUUwnv/HWWVIaibZH06iPg663RYQ6C6Zy4FnO8=
394403
k8s.io/cloud-provider v0.31.3/go.mod h1:c7csKppoVb9Ej6upJ28AvHy4B3BtlRMzXfgezsDdPKw=
404+
k8s.io/cloud-provider v0.33.6/go.mod h1:I08jJ7obAWjv9z5ZcabdOV3aizfo7ru495xuxlHQw84=
405+
k8s.io/component-base v0.33.6/go.mod h1:rUo6Mge+6JvNLrhRzhotfGLxI0tyaQXbL2rnth4UEFw=
395406
k8s.io/component-base v0.36.0 h1:hFjEktssxiJhrK1zfybkH4kJOi8iZuF+mIDCqS5+jRo=
396407
k8s.io/component-base v0.36.0/go.mod h1:JZvIfcNHk+uck+8LhJzhSBtydWXaZNQwX2OdL+Mnwsk=
397408
k8s.io/component-helpers v0.31.3 h1:0zGPD2PrekhFWgmz85XxlMEl7dfhlKC1tERZDe3onQc=
398409
k8s.io/component-helpers v0.31.3/go.mod h1:HZ1HZx2TKXM7xSUV2cR9L5yDoyZPhhHQNaE3BPBLPUQ=
410+
k8s.io/component-helpers v0.33.6/go.mod h1:rAX3imLcTAozWTRhR13/LAR3Mf8bksoayTpUdKZFUJo=
399411
k8s.io/controller-manager v0.31.3 h1:TyUav69iNYwLGwA96JDhusoZoGRdh1sdrLjXmWTcPgs=
400412
k8s.io/controller-manager v0.31.3/go.mod h1:yuhec+dbXmBz+4c32kxJxmcauB+1pjO2ttfYODWuv18=
413+
k8s.io/controller-manager v0.33.6/go.mod h1:dtCyZIG+CNFI8hY/lQY7ZAOO20VxGm+lpi1do2fmLGY=
401414
k8s.io/csi-translation-lib v0.31.3 h1:hxcPRNdtEsk766jCXSKjgH1V8jUNx5tVqdooQ1Ars/M=
402415
k8s.io/csi-translation-lib v0.31.3/go.mod h1:0B1gQwd868XUIDwJYy5gB2jDXWEwlcWvSsfcQEgzbRk=
416+
k8s.io/csi-translation-lib v0.33.6/go.mod h1:t266CgUYPVdST8pjPaCOEDLejWwV1Tms5igy8FVYyQo=
403417
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
404418
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
419+
k8s.io/kms v0.33.6/go.mod h1:C1I8mjFFBNzfUZXYt9FZVJ8MJl7ynFbGgZFbBzkBJ3E=
405420
k8s.io/kms v0.36.0 h1:DPy0VDWi6hCgFMgzV5cNuSDrIROMRcJpTZ1GnB+D368=
406421
k8s.io/kms v0.36.0/go.mod h1:g91diTD9h0oJCCHkTb00krlF+Qm5HTnkWLi9Q/TpRoc=
407422
k8s.io/kube-openapi v0.0.0-20260414162039-ec9c827d403f h1:4Qiq0YAoQATdgmHALJWz9rJ4fj20pB3xebpB4CFNhYM=
408423
k8s.io/kube-openapi v0.0.0-20260414162039-ec9c827d403f/go.mod h1:uGBT7iTA6c6MvqUvSXIaYZo9ukscABYi2btjhvgKGZ0=
409424
k8s.io/kubectl v0.31.3 h1:3r111pCjPsvnR98oLLxDMwAeM6OPGmPty6gSKaLTQes=
410425
k8s.io/kubectl v0.31.3/go.mod h1:lhMECDCbJN8He12qcKqs2QfmVo9Pue30geovBVpH5fs=
426+
k8s.io/kubectl v0.33.6/go.mod h1:G6iCkPDPQbCbIp01QkD29wdo5hSkBQ2c7vv9YtOUPME=
411427
k8s.io/kubelet v0.31.3 h1:DIXRAmvVGp42mV2vpA1GCLU6oO8who0/vp3Oq6kSpbI=
412428
k8s.io/kubelet v0.31.3/go.mod h1:KSdbEfNy5VzqUlAHlytA/fH12s+sE1u8fb/8JY9sL/8=
429+
k8s.io/kubelet v0.33.6/go.mod h1:Nkjry+BISpPNb0WroNJVRYjOe7YacvDYNMbFXMyHEdU=
413430
k8s.io/kubernetes v1.31.6 h1:zVhgWDFHmIj51o5sNARmjdgNvpq4K2Smya8pS5vxqlc=
414431
k8s.io/kubernetes v1.31.6/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
432+
k8s.io/kubernetes v1.33.6 h1:NOIZqkx8M4XfdyRKllzLSBiMgSilPzSvCembfzOMk6A=
433+
k8s.io/kubernetes v1.33.6/go.mod h1:eJiHC143tnNSvmDkCRwGNKA80yXqBvYC3U8L/i67nAY=
434+
k8s.io/mount-utils v0.33.10/go.mod h1:1JR4rKymg8B8bCPo618hpSAdrpO6XLh0Acqok/xVwPE=
415435
k8s.io/mount-utils v0.36.0 h1:ufsqGyCoPDh7p+6OIa1wv6oH9GqkQQ8XIfEOVfCV3g0=
416436
k8s.io/mount-utils v0.36.0/go.mod h1:+I47UOG6FiUGVSy7VanjU/mQXLShMo3M7xBpGLzCub8=
417437
k8s.io/pod-security-admission v0.31.3 h1:8NzEV0HtdStX367AuSKfRMIZHn0hT4xuz8xNEf7/zO8=
418438
k8s.io/pod-security-admission v0.31.3/go.mod h1:YMIcTe/7f9R9d+3ErCMMM3Wtbj9ejKo7Z9S0OxZQrRg=
439+
k8s.io/pod-security-admission v0.33.6/go.mod h1:Wb2D6QVkAZhc0ou+RcqvuNDEALcMw0bYu1jf0yeBCow=
419440
k8s.io/streaming v0.36.0 h1:agnTxU+NFulUrtYzXUGKO3ndEa8jKwht1Kwn9nu9x+4=
420441
k8s.io/streaming v0.36.0/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s=
421442
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 h1:kBawHLSnx/mYHmRnNUf9d4CpjREbeZuxoSGOX/J+aYM=

‎tests/e2e-kubernetes/switch-k8s-version.sh‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/sh
2+
#
3+
# Taken from https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-521493597.
4+
# If you get errors like "unknown revision v0.0.0" in any of Kubernetes packages,
5+
# you need to use this script to sync versions of various Kubernetes packages.
6+
# Example usage:
7+
# $ ./switch-k8s-version.sh 1.32.2
8+
set -euo pipefail
9+
10+
VERSION=${1#"v"}
11+
if [ -z "$VERSION" ]; then
12+
echo "Must specify version!"
13+
exit 1
14+
fi
15+
MODS=($(
16+
curl -sS https://raw.githubusercontent.com/kubernetes/kubernetes/v${VERSION}/go.mod |
17+
sed -n 's|.*k8s.io/\(.*\) => ./staging/src/k8s.io/.*|k8s.io/\1|p'
18+
))
19+
for MOD in "${MODS[@]}"; do
20+
V=$(
21+
go mod download -json "${MOD}@kubernetes-${VERSION}" |
22+
sed -n 's|.*"Version": "\(.*\)".*|\1|p'
23+
)
24+
go mod edit "-replace=${MOD}=${MOD}@${V}"
25+
done
26+
go get "k8s.io/kubernetes@v${VERSION}"

0 commit comments

Comments
 (0)