Skip to content

Commit 315728e

Browse files
authored
chore(deps): drop k8s.io/kubernetes and bump k8s modules to v0.37.2 (#1333)
* chore(deps): bump k8s staging modules to v0.37.2 k8s.io/kubernetes is at v1.37.2 but the replace block pinned every k8s.io staging module to v0.37.0, so the build mixed two patch releases. Dependabot only edits require lines, so its k8s bumps were silently overridden by the replace block. * chore(deps): drop k8s.io/kubernetes dependency k8s.io/kubernetes was imported for a single test helper, WaitForPodNameRunningInNamespace. Its go.mod requires the k8s.io staging modules at the unpublished v0.0.0, which forced a 32-line replace block and left `go list -m all` unresolvable (k8s.io/cri-streaming has no published version). The helper is replaced by a wait.PollUntilContextTimeout loop with the same semantics: 5 minute timeout, retry while the pod is missing, stop early on a terminal phase. This removes the replace block and 53 modules from the graph. The client-go require now states v0.37.2, the version the replace was already selecting. * test(kube): fail fast on permanent API errors while waiting for a pod waitForPodRunning retried every Get error, so a permanent failure such as a 403 polled for the full 5 minutes and surfaced only "context deadline exceeded". It now retries only not-found and transient errors (timeout, 429, 503) and returns anything else immediately, matching the e2e framework helper it replaced. * test(kube): retry server timeouts and connection blips while waiting for a pod A 504 server timeout, a connection reset or an unexpected EOF from the API server failed the wait on the first poll, so a single transient blip could fail the whole KubeTestSuite. These are now retried like the other transient errors. Also call CoreV1 through suite.clientset.Clientset, as the rest of the file does. * test(kube): report the last pod phase and error when the wait times out A timed-out wait returned a bare "context deadline exceeded", which does not say whether the pod was stuck in Pending (for example on an image pull) or the API kept returning transient errors. The error now includes the last observed phase and the last retried error. The timeout is detected by comparing against the deadline rather than with wait.Interrupted: when the final poll races the deadline, client-go's rate limiter fails the Get with an error that does not wrap context.DeadlineExceeded.
1 parent 4f90bb6 commit 315728e

3 files changed

Lines changed: 49 additions & 245 deletions

File tree

‎go.mod‎

Lines changed: 3 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,14 @@ require (
6060
google.golang.org/grpc v1.85.0
6161
google.golang.org/protobuf v1.36.12
6262
gopkg.in/yaml.v3 v3.0.1
63-
k8s.io/api v0.37.0
64-
k8s.io/apimachinery v0.37.0
65-
k8s.io/client-go v1.5.2
66-
k8s.io/kubernetes v1.37.2
63+
k8s.io/api v0.37.2
64+
k8s.io/apimachinery v0.37.2
65+
k8s.io/client-go v0.37.2
6766
sigs.k8s.io/kind v0.33.0
6867
)
6968

7069
require (
7170
al.essio.dev/pkg/shellescape v1.6.0 // indirect
72-
cel.dev/expr v0.25.3 // indirect
7371
cloud.google.com/go v0.123.0 // indirect
7472
cloud.google.com/go/accesscontextmanager v1.15.0 // indirect
7573
cloud.google.com/go/auth v0.24.1-0.20261001053825-dbc26066f70a // indirect
@@ -81,15 +79,12 @@ require (
8179
cloud.google.com/go/osconfig v1.22.0 // indirect
8280
dario.cat/mergo v1.0.2 // indirect
8381
github.com/Azure/azure-sdk-for-go/sdk/internal v1.13.0 // indirect
84-
github.com/Azure/go-ansiterm v0.0.0-20261006220739-8c912ac31dd4 // indirect
8582
github.com/AzureAD/microsoft-authentication-library-for-go v1.10.1 // indirect
8683
github.com/BurntSushi/toml v1.5.0 // indirect
87-
github.com/MakeNowJust/heredoc v1.0.0 // indirect
8884
github.com/Microsoft/go-winio v0.6.2 // indirect
8985
github.com/ProtonMail/go-crypto v1.2.0 // indirect
9086
github.com/agnivade/levenshtein v1.2.1 // indirect
9187
github.com/anchore/go-struct-converter v0.1.0 // indirect
92-
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
9388
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.25 // indirect
9489
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.20.5 // indirect
9590
github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.8 // indirect
@@ -104,11 +99,7 @@ require (
10499
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.44.1 // indirect
105100
github.com/aws/aws-sdk-go-v2/service/sts v1.51.6 // indirect
106101
github.com/aws/smithy-go v1.28.7 // indirect
107-
github.com/beorn7/perks v1.0.1 // indirect
108-
github.com/blang/semver/v4 v4.0.0 // indirect
109-
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
110102
github.com/cespare/xxhash/v2 v2.3.0 // indirect
111-
github.com/chai2010/gettext-go v1.0.2 // indirect
112103
github.com/cloudflare/circl v1.6.3 // indirect
113104
github.com/containerd/errdefs/pkg v0.3.0 // indirect
114105
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
@@ -127,14 +118,11 @@ require (
127118
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
128119
github.com/emirpasic/gods v1.18.1 // indirect
129120
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
130-
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
131-
github.com/fatih/camelcase v1.0.0 // indirect
132121
github.com/fatih/structs v1.1.0 // indirect
133122
github.com/felixge/httpsnoop v1.1.0 // indirect
134123
github.com/fsnotify/fsnotify v1.10.1 // indirect
135124
github.com/fxamacker/cbor/v2 v2.9.1 // indirect
136125
github.com/gabriel-vasile/mimetype v1.4.16 // indirect
137-
github.com/go-errors/errors v1.4.2 // indirect
138126
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
139127
github.com/go-logr/logr v1.4.4 // indirect
140128
github.com/go-logr/stdr v1.2.2 // indirect
@@ -154,25 +142,18 @@ require (
154142
github.com/go-openapi/swag/yamlutils v0.28.0 // indirect
155143
github.com/go-playground/locales v0.14.2 // indirect
156144
github.com/go-playground/universal-translator v0.18.2 // indirect
157-
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
158145
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
159146
github.com/gobwas/glob v1.0.0 // indirect
160147
github.com/goccy/go-json v0.10.6 // indirect
161148
github.com/godbus/dbus/v5 v5.2.2 // indirect
162149
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
163150
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
164151
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
165-
github.com/google/btree v1.1.3 // indirect
166-
github.com/google/cel-go v0.29.2 // indirect
167152
github.com/google/gnostic-models v0.7.0 // indirect
168-
github.com/google/go-cmp v0.7.0 // indirect
169153
github.com/google/go-querystring v1.2.0 // indirect
170-
github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 // indirect
171154
github.com/google/s2a-go v0.1.11 // indirect
172155
github.com/googleapis/enterprise-certificate-proxy v0.3.24 // indirect
173156
github.com/gorilla/mux v1.8.1 // indirect
174-
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
175-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 // indirect
176157
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
177158
github.com/inconshreveable/mousetrap v1.1.0 // indirect
178159
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -187,35 +168,22 @@ require (
187168
github.com/lestrrat-go/httprc/v3 v3.0.6 // indirect
188169
github.com/lestrrat-go/jwx/v3 v3.3.0 // indirect
189170
github.com/lestrrat-go/option/v2 v2.0.0 // indirect
190-
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
191171
github.com/mattn/go-isatty v0.0.20 // indirect
192-
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
193172
github.com/moby/docker-image-spec v1.3.1 // indirect
194-
github.com/moby/spdystream v0.5.1 // indirect
195173
github.com/moby/sys/capability v0.4.0 // indirect
196174
github.com/moby/sys/mountinfo v0.7.2 // indirect
197175
github.com/moby/sys/user v0.4.1 // indirect
198-
github.com/moby/term v0.5.2 // indirect
199176
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
200177
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
201-
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
202178
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
203-
github.com/onsi/ginkgo/v2 v2.32.0 // indirect
204179
github.com/onsi/gomega v1.40.0 // indirect
205180
github.com/opencontainers/image-spec v1.1.1 // indirect
206181
github.com/opencontainers/runtime-spec v1.3.0 // indirect
207182
github.com/otiai10/mint v1.6.3 // indirect
208183
github.com/pelletier/go-toml v1.9.5 // indirect
209184
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
210-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
211185
github.com/pjbgf/sha1cd v0.7.0 // indirect
212186
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
213-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
214-
github.com/prometheus/client_golang v1.24.1 // indirect
215-
github.com/prometheus/client_model v0.6.3 // indirect
216-
github.com/prometheus/common v0.70.1 // indirect
217-
github.com/prometheus/procfs v0.21.1 // indirect
218-
github.com/robfig/cron/v3 v3.0.1 // indirect
219187
github.com/russross/blackfriday/v2 v2.1.0 // indirect
220188
github.com/sagikazarmark/locafero v0.11.0 // indirect
221189
github.com/segmentio/asm v1.2.1 // indirect
@@ -234,19 +202,14 @@ require (
234202
github.com/xanzy/ssh-agent v0.3.3 // indirect
235203
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
236204
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
237-
github.com/xlab/treeprint v1.2.0 // indirect
238205
github.com/yashtewari/glob-intersection v0.2.0 // indirect
239206
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
240207
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.70.0 // indirect
241208
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0 // indirect
242209
go.opentelemetry.io/otel v1.47.0 // indirect
243-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.46.0 // indirect
244-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.46.0 // indirect
245210
go.opentelemetry.io/otel/log v1.47.0 // indirect
246211
go.opentelemetry.io/otel/metric v1.47.0 // indirect
247-
go.opentelemetry.io/otel/sdk v1.47.0 // indirect
248212
go.opentelemetry.io/otel/trace v1.47.0 // indirect
249-
go.opentelemetry.io/proto/otlp v1.11.0 // indirect
250213
go.yaml.in/yaml/v2 v2.4.4 // indirect
251214
go.yaml.in/yaml/v3 v3.0.6 // indirect
252215
golang.org/x/crypto v0.58.0 // indirect
@@ -256,98 +219,20 @@ require (
256219
golang.org/x/sys v0.49.0 // indirect
257220
golang.org/x/text v0.43.0 // indirect
258221
golang.org/x/time v0.16.0 // indirect
259-
golang.org/x/tools v0.51.0 // indirect
260222
google.golang.org/genproto v0.0.0-20261012220534-4341edf3f941 // indirect
261223
google.golang.org/genproto/googleapis/api v0.0.0-20261012220534-4341edf3f941 // indirect
262224
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
263225
gopkg.in/inf.v0 v0.9.1 // indirect
264226
gopkg.in/warnings.v0 v0.1.2 // indirect
265-
k8s.io/apiextensions-apiserver v0.0.0 // indirect
266-
k8s.io/apiserver v0.37.0 // indirect
267-
k8s.io/cli-runtime v0.37.0 // indirect
268-
k8s.io/component-base v0.37.0 // indirect
269-
k8s.io/component-helpers v0.37.0 // indirect
270-
k8s.io/controller-manager v0.37.0 // indirect
271227
k8s.io/klog/v2 v2.140.0 // indirect
272228
k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad // indirect
273-
k8s.io/kubectl v0.0.0 // indirect
274-
k8s.io/kubelet v0.0.0 // indirect
275-
k8s.io/pod-security-admission v0.0.0 // indirect
276-
k8s.io/streaming v0.37.0 // indirect
277229
k8s.io/utils v0.0.0-20260626114624-be93311217bd // indirect
278-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0 // indirect
279230
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
280-
sigs.k8s.io/kustomize/api v0.21.1 // indirect
281-
sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect
282231
sigs.k8s.io/randfill v1.0.0 // indirect
283232
sigs.k8s.io/structured-merge-diff/v6 v6.4.2 // indirect
284233
sigs.k8s.io/yaml v1.6.0 // indirect
285234
)
286235

287-
replace k8s.io/client-go => k8s.io/client-go v0.37.0
288-
289-
replace k8s.io/api => k8s.io/api v0.37.0
290-
291-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.37.0
292-
293-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.37.0
294-
295-
replace k8s.io/apiserver => k8s.io/apiserver v0.37.0
296-
297-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.37.0
298-
299-
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.37.0
300-
301-
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.37.0
302-
303-
replace k8s.io/code-generator => k8s.io/code-generator v0.37.0
304-
305-
replace k8s.io/component-base => k8s.io/component-base v0.37.0
306-
307-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.37.0
308-
309-
replace k8s.io/controller-manager => k8s.io/controller-manager v0.37.0
310-
311-
replace k8s.io/cri-api => k8s.io/cri-api v0.37.0
312-
313-
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.37.0
314-
315-
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.37.0
316-
317-
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.37.0
318-
319-
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.37.0
320-
321-
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.37.0
322-
323-
replace k8s.io/kubectl => k8s.io/kubectl v0.37.0
324-
325-
replace k8s.io/kubelet => k8s.io/kubelet v0.37.0
326-
327-
replace k8s.io/metrics => k8s.io/metrics v0.37.0
328-
329-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.37.0
330-
331-
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.37.0
332-
333-
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.37.0
334-
335-
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.37.0
336-
337-
replace k8s.io/sample-controller => k8s.io/sample-controller v0.37.0
338-
339236
replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.2
340237

341-
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.37.0
342-
343-
replace k8s.io/kms => k8s.io/kms v0.37.0
344-
345-
replace k8s.io/endpointslice => k8s.io/endpointslice v0.37.0
346-
347-
replace k8s.io/cri-client => k8s.io/cri-client v0.37.0
348-
349-
replace k8s.io/externaljwt => k8s.io/externaljwt v0.37.0
350-
351-
replace k8s.io/streaming => k8s.io/streaming v0.37.0
352-
353238
replace github.com/docker/docker => github.com/moby/moby v28.5.2+incompatible

0 commit comments

Comments
 (0)