Skip to content

Commit 1ee6e3f

Browse files
sgalsalehclaude
andcommitted
chore(deps): upgrade troubleshoot to v0.134.0 and k8s libs to 1.37
troubleshoot v0.134.0 carries three support bundle redaction fixes: connection strings without a trailing database name, credentials in mysql DSNs over tcp4/tcp6/unix, and an expanded env-name list covering api_key, secret, auth, private_key and credential. It requires the k8s 0.37 staging modules, which need k8s.io/kubernetes and k8s.io/component-helpers raised to match: both are indirect, so nothing in the graph was pulling them up, leaving 0.36 kubelet and component-helpers code compiling against 0.37 API types. Raise both, retarget the existing staging replace block, and move kubectl and cluster-bootstrap so the tree is not split across two k8s lines. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
1 parent f68fcbf commit 1ee6e3f

2 files changed

Lines changed: 196 additions & 233 deletions

File tree

go.mod

Lines changed: 61 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ require (
5555
github.com/replicatedhq/embedded-cluster/kinds v1.15.1-0.20250729184643-f055e67a064d
5656
github.com/replicatedhq/kotskinds v0.0.0-20251219184143-fc5e03d7bbc6
5757
github.com/replicatedhq/kurlkinds v1.5.0
58-
github.com/replicatedhq/troubleshoot v0.133.0
58+
github.com/replicatedhq/troubleshoot v0.134.0
5959
github.com/robfig/cron v1.2.0
6060
github.com/robfig/cron/v3 v3.0.1
6161
github.com/rqlite/gorqlite v0.0.0-20260504155303-50d445fd0ab9
@@ -83,14 +83,14 @@ require (
8383
gopkg.in/ini.v1 v1.67.3
8484
gopkg.in/yaml.v2 v2.4.0
8585
helm.sh/helm/v4 v4.1.4
86-
k8s.io/api v0.36.3
87-
k8s.io/apimachinery v0.36.3
88-
k8s.io/cli-runtime v0.36.3
89-
k8s.io/client-go v0.36.3
90-
k8s.io/cluster-bootstrap v0.36.3
86+
k8s.io/api v0.37.0
87+
k8s.io/apimachinery v0.37.0
88+
k8s.io/cli-runtime v0.37.0
89+
k8s.io/client-go v0.37.0
90+
k8s.io/cluster-bootstrap v0.37.0
9191
k8s.io/helm v2.17.0+incompatible
92-
k8s.io/kubelet v0.36.3
93-
k8s.io/metrics v0.36.3
92+
k8s.io/kubelet v0.37.0
93+
k8s.io/metrics v0.37.0
9494
k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3
9595
oras.land/oras-go/v2 v2.6.2
9696
sigs.k8s.io/application v0.8.3
@@ -125,19 +125,19 @@ require (
125125
github.com/agnivade/levenshtein v1.2.1 // indirect
126126
github.com/andybalholm/brotli v1.2.2 // indirect
127127
github.com/apparentlymart/go-cidr v1.1.1 // indirect
128-
github.com/aws/aws-sdk-go-v2 v1.43.6 // indirect
128+
github.com/aws/aws-sdk-go-v2 v1.45.1 // indirect
129129
github.com/aws/aws-sdk-go-v2/config v1.32.35 // indirect
130-
github.com/aws/aws-sdk-go-v2/credentials v1.19.36 // indirect
131-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.37 // indirect
132-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.37 // indirect
133-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.37 // indirect
134-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.17 // indirect
135-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.37 // indirect
130+
github.com/aws/aws-sdk-go-v2/credentials v1.20.1 // indirect
131+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.19.1 // indirect
132+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.1 // indirect
133+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.1 // indirect
134+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.19 // indirect
135+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.1 // indirect
136136
github.com/aws/aws-sdk-go-v2/service/ssm v1.68.6 // indirect
137-
github.com/aws/aws-sdk-go-v2/service/sso v1.33.6 // indirect
138-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.38.6 // indirect
139-
github.com/aws/aws-sdk-go-v2/service/sts v1.45.6 // indirect
140-
github.com/aws/smithy-go v1.27.8 // indirect
137+
github.com/aws/aws-sdk-go-v2/service/sso v1.35.1 // indirect
138+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.40.1 // indirect
139+
github.com/aws/aws-sdk-go-v2/service/sts v1.47.1 // indirect
140+
github.com/aws/smithy-go v1.28.1 // indirect
141141
github.com/beorn7/perks v1.0.1 // indirect
142142
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
143143
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -157,7 +157,7 @@ require (
157157
github.com/cyphar/filepath-securejoin v0.7.0 // indirect
158158
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
159159
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
160-
github.com/docker/cli v29.7.1+incompatible // indirect
160+
github.com/docker/cli v29.7.2+incompatible // indirect
161161
github.com/docker/distribution v2.8.3+incompatible // indirect
162162
github.com/docker/docker-credential-helpers v0.9.8 // indirect
163163
github.com/docker/go-connections v0.8.1 // indirect
@@ -196,7 +196,7 @@ require (
196196
github.com/google/btree v1.1.3 // indirect
197197
github.com/google/gnostic-models v0.7.1 // indirect
198198
github.com/google/go-cmp v0.7.0 // indirect
199-
github.com/google/go-containerregistry v0.21.9 // indirect
199+
github.com/google/go-containerregistry v0.22.0 // indirect
200200
github.com/google/go-intervals v0.0.2 // indirect
201201
github.com/google/go-querystring v1.1.0 // indirect
202202
github.com/google/gofuzz v1.2.0 // indirect
@@ -235,7 +235,7 @@ require (
235235
github.com/mattn/go-colorable v0.1.15 // indirect
236236
github.com/mattn/go-runewidth v0.0.27 // indirect
237237
github.com/mattn/go-sqlite3 v2.0.3+incompatible
238-
github.com/microsoft/go-mssqldb v1.10.0 // indirect
238+
github.com/microsoft/go-mssqldb v1.11.0 // indirect
239239
github.com/miekg/pkcs11 v1.1.2 // indirect
240240
github.com/mitchellh/copystructure v1.2.0 // indirect
241241
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -261,10 +261,10 @@ require (
261261
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
262262
github.com/pquerna/cachecontrol v0.1.0 // indirect
263263
github.com/proglottis/gpgme v0.1.6 // indirect
264-
github.com/prometheus/client_golang v1.23.2 // indirect
264+
github.com/prometheus/client_golang v1.24.0 // indirect
265265
github.com/prometheus/client_model v0.6.2 // indirect
266-
github.com/prometheus/common v0.67.5 // indirect
267-
github.com/prometheus/procfs v0.20.1 // indirect
266+
github.com/prometheus/common v0.70.0 // indirect
267+
github.com/prometheus/procfs v0.21.1 // indirect
268268
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
269269
github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3 // indirect
270270
github.com/redis/go-redis/extra/redisotel/v9 v9.5.3 // indirect
@@ -297,7 +297,7 @@ require (
297297
go.opentelemetry.io/contrib/exporters/autoexport v0.67.0 // indirect
298298
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.69.0 // indirect
299299
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 // indirect
300-
go.opentelemetry.io/otel v1.45.0 // indirect
300+
go.opentelemetry.io/otel v1.46.0 // indirect
301301
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.44.0 // indirect
302302
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.44.0 // indirect
303303
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0 // indirect
@@ -306,10 +306,10 @@ require (
306306
go.opentelemetry.io/otel/exporters/prometheus v0.65.0 // indirect
307307
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.44.0 // indirect
308308
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.43.0 // indirect
309-
go.opentelemetry.io/otel/metric v1.45.0 // indirect
310-
go.opentelemetry.io/otel/sdk v1.45.0 // indirect
311-
go.opentelemetry.io/otel/sdk/metric v1.45.0 // indirect
312-
go.opentelemetry.io/otel/trace v1.45.0 // indirect
309+
go.opentelemetry.io/otel/metric v1.46.0 // indirect
310+
go.opentelemetry.io/otel/sdk v1.46.0 // indirect
311+
go.opentelemetry.io/otel/sdk/metric v1.46.0 // indirect
312+
go.opentelemetry.io/otel/trace v1.46.0 // indirect
313313
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
314314
golang.org/x/mod v0.40.0 // indirect
315315
golang.org/x/net v0.58.0 // indirect
@@ -325,12 +325,12 @@ require (
325325
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
326326
gopkg.in/inf.v0 v0.9.1 // indirect
327327
gopkg.in/warnings.v0 v0.1.2 // indirect
328-
k8s.io/apiextensions-apiserver v0.36.3 // indirect
329-
k8s.io/apiserver v0.36.3 // indirect
330-
k8s.io/component-base v0.36.3 // indirect
328+
k8s.io/apiextensions-apiserver v0.37.0 // indirect
329+
k8s.io/apiserver v0.37.0 // indirect
330+
k8s.io/component-base v0.37.0 // indirect
331331
k8s.io/klog/v2 v2.140.0 // indirect
332332
k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad // indirect
333-
k8s.io/kubectl v0.36.3
333+
k8s.io/kubectl v0.37.0
334334
periph.io/x/host/v3 v3.8.5 // indirect
335335
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
336336
)
@@ -352,12 +352,12 @@ require (
352352
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
353353
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
354354
github.com/avast/retry-go/v4 v4.7.0 // indirect
355-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.18 // indirect
356-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.38 // indirect
357-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.30 // indirect
358-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.38 // indirect
359-
github.com/aws/aws-sdk-go-v2/service/s3 v1.107.2 // indirect
360-
github.com/aws/aws-sdk-go-v2/service/signin v1.5.6 // indirect
355+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.20 // indirect
356+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.1 // indirect
357+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.11.1 // indirect
358+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.20.1 // indirect
359+
github.com/aws/aws-sdk-go-v2/service/s3 v1.109.1 // indirect
360+
github.com/aws/aws-sdk-go-v2/service/signin v1.7.1 // indirect
361361
github.com/bodgit/plumbing v1.3.0 // indirect
362362
github.com/bodgit/sevenzip v1.6.1 // indirect
363363
github.com/bodgit/windows v1.0.1 // indirect
@@ -370,18 +370,14 @@ require (
370370
github.com/cockroachdb/errors v1.14.0 // indirect
371371
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 // indirect
372372
github.com/cockroachdb/redact v1.1.8 // indirect
373-
github.com/containerd/containerd/api v1.10.0 // indirect
374373
github.com/containerd/errdefs/pkg v0.3.0 // indirect
375-
github.com/containerd/ttrpc v1.2.7 // indirect
376-
github.com/containerd/typeurl/v2 v2.2.3 // indirect
377374
github.com/coreos/go-semver v0.3.1 // indirect
378375
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 // indirect
379376
github.com/dnaeon/go-vcr v1.2.0 // indirect
380377
github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a // indirect
381378
github.com/ebitengine/purego v0.10.2 // indirect
382379
github.com/envoyproxy/go-control-plane/envoy v1.37.0 // indirect
383380
github.com/envoyproxy/protoc-gen-validate v1.3.3 // indirect
384-
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
385381
github.com/extism/go-sdk v1.7.1 // indirect
386382
github.com/fluxcd/cli-utils v1.2.1 // indirect
387383
github.com/fxamacker/cbor/v2 v2.9.2 // indirect
@@ -405,15 +401,12 @@ require (
405401
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
406402
github.com/goccy/go-json v0.10.6 // indirect
407403
github.com/gofrs/flock v0.13.0 // indirect
408-
github.com/google/cadvisor v0.56.2 // indirect
409-
github.com/google/cel-go v0.29.0 // indirect
404+
github.com/google/cadvisor/lib v0.60.5 // indirect
405+
github.com/google/cel-go v0.29.2 // indirect
410406
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
411407
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect
412408
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.74 // indirect
413-
github.com/hashicorp/go-hclog v1.6.3 // indirect
414-
github.com/hashicorp/go-plugin v1.8.0 // indirect
415409
github.com/hashicorp/logutils v1.0.0 // indirect
416-
github.com/hashicorp/yamux v0.1.2 // indirect
417410
github.com/ianlancetaylor/demangle v0.0.0-20250417193237-f615e6bd150b // indirect
418411
github.com/k0sproject/dig v0.4.0 // indirect
419412
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
@@ -439,9 +432,8 @@ require (
439432
github.com/moby/sys/userns v0.1.0 // indirect
440433
github.com/nwaples/rardecode/v2 v2.2.0 // indirect
441434
github.com/nxadm/tail v1.4.11 // indirect
442-
github.com/oklog/run v1.1.0 // indirect
443435
github.com/onsi/ginkgo v1.16.5 // indirect
444-
github.com/opencontainers/cgroups v0.0.6 // indirect
436+
github.com/opencontainers/cgroups v0.0.7 // indirect
445437
github.com/otiai10/mint v1.6.3 // indirect
446438
github.com/paulmach/orb v0.13.0 // indirect
447439
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
@@ -467,10 +459,9 @@ require (
467459
github.com/x448/float16 v0.8.4 // indirect
468460
github.com/xo/dburl v0.24.2 // indirect
469461
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
470-
go.etcd.io/etcd/api/v3 v3.6.14 // indirect
471-
go.etcd.io/etcd/client/pkg/v3 v3.6.14 // indirect
472-
go.etcd.io/etcd/client/v3 v3.6.14 // indirect
473-
go.etcd.io/etcd/server/v3 v3.6.14 // indirect
462+
go.etcd.io/etcd/api/v3 v3.7.0 // indirect
463+
go.etcd.io/etcd/client/pkg/v3 v3.7.0 // indirect
464+
go.etcd.io/etcd/client/v3 v3.7.0 // indirect
474465
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
475466
go.opentelemetry.io/contrib/bridges/prometheus v0.69.0 // indirect
476467
go.opentelemetry.io/contrib/detectors/gcp v1.44.0 // indirect
@@ -481,34 +472,34 @@ require (
481472
go.opentelemetry.io/otel/sdk/log v0.19.0 // indirect
482473
go.podman.io/storage v1.64.0 // indirect
483474
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
484-
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect
475+
golang.org/x/exp v0.0.0-20260820142414-ca536658362e // indirect
485476
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
486477
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
487478
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
488479
gopkg.in/yaml.v3 v3.0.1 // indirect
489480
helm.sh/helm/v3 v3.21.4 // indirect
490481
k8s.io/cloud-provider v0.36.0 // indirect
491-
k8s.io/component-helpers v0.36.3 // indirect
482+
k8s.io/component-helpers v0.37.0 // indirect
492483
k8s.io/controller-manager v0.36.0 // indirect
493484
k8s.io/cri-api v0.36.0 // indirect
494485
k8s.io/cri-client v0.36.0 // indirect
495-
k8s.io/kms v0.36.3 // indirect
496-
k8s.io/kubernetes v1.36.0 // indirect
486+
k8s.io/kms v0.37.0 // indirect
487+
k8s.io/kubernetes v1.37.0 // indirect
497488
k8s.io/mount-utils v0.36.0 // indirect
498-
k8s.io/streaming v0.36.3 // indirect
499-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
489+
k8s.io/streaming v0.37.0 // indirect
490+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0 // indirect
500491
sigs.k8s.io/randfill v1.0.0 // indirect
501492
sigs.k8s.io/structured-merge-diff/v6 v6.4.2 // indirect
502493
)
503494

504495
replace (
505-
k8s.io/cri-streaming => k8s.io/cri-streaming v0.36.0
506-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.36.0
507-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.36.0
508-
k8s.io/endpointslice => k8s.io/endpointslice v0.36.0
509-
k8s.io/externaljwt => k8s.io/externaljwt v0.36.0
510-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.36.0
511-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.36.0
512-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.36.0
513-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.36.0
496+
k8s.io/cri-streaming => k8s.io/cri-streaming v0.37.0
497+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.37.0
498+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.37.0
499+
k8s.io/endpointslice => k8s.io/endpointslice v0.37.0
500+
k8s.io/externaljwt => k8s.io/externaljwt v0.37.0
501+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.37.0
502+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.37.0
503+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.37.0
504+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.37.0
514505
)

0 commit comments

Comments
 (0)