Skip to content

Commit e725216

Browse files
authored
[1.34] bumped dependencies for 1.34 support (#242)
1 parent 5ac0e91 commit e725216

File tree

3 files changed

+260
-253
lines changed

3 files changed

+260
-253
lines changed

go.mod

Lines changed: 99 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -2,98 +2,100 @@ module github.com/rancher/system-agent
22

33
go 1.24.6
44

5+
toolchain go1.24.7
6+
57
replace (
68
// replace those modules from go.opentelemetry.io to elimilate CVEs
7-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0
8-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0
9-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0
9+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0
10+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0
11+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0
1012

11-
k8s.io/api => k8s.io/api v0.33.5
12-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.5
13-
k8s.io/apimachinery => k8s.io/apimachinery v0.33.5
14-
k8s.io/apiserver => k8s.io/apiserver v0.33.5
15-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.5
16-
k8s.io/client-go => k8s.io/client-go v0.33.5
17-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.5
18-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.5
19-
k8s.io/code-generator => k8s.io/code-generator v0.33.5
20-
k8s.io/component-base => k8s.io/component-base v0.33.5
21-
k8s.io/component-helpers => k8s.io/component-helpers v0.33.5
22-
k8s.io/controller-manager => k8s.io/controller-manager v0.33.5
23-
k8s.io/cri-api => k8s.io/cri-api v0.33.5
24-
k8s.io/cri-client => k8s.io/cri-client v0.33.5
25-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.5
26-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.5
27-
k8s.io/endpointslice => k8s.io/endpointslice v0.33.5
28-
k8s.io/externaljwt => k8s.io/externaljwt v0.33.5
29-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.5
30-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.5
31-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.5
32-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.5
33-
k8s.io/kubectl => k8s.io/kubectl v0.33.5
34-
k8s.io/kubelet => k8s.io/kubelet v0.33.5
35-
k8s.io/kubernetes => k8s.io/kubernetes v1.33.5
36-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.33.5
37-
k8s.io/metrics => k8s.io/metrics v0.33.5
38-
k8s.io/mount-utils => k8s.io/mount-utils v0.33.5
39-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.5
40-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.5
13+
k8s.io/api => k8s.io/api v0.34.1
14+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.1
15+
k8s.io/apimachinery => k8s.io/apimachinery v0.34.1
16+
k8s.io/apiserver => k8s.io/apiserver v0.34.1
17+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.1
18+
k8s.io/client-go => k8s.io/client-go v0.34.1
19+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.1
20+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.1
21+
k8s.io/code-generator => k8s.io/code-generator v0.34.1
22+
k8s.io/component-base => k8s.io/component-base v0.34.1
23+
k8s.io/component-helpers => k8s.io/component-helpers v0.34.1
24+
k8s.io/controller-manager => k8s.io/controller-manager v0.34.1
25+
k8s.io/cri-api => k8s.io/cri-api v0.34.1
26+
k8s.io/cri-client => k8s.io/cri-client v0.34.1
27+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.1
28+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.1
29+
k8s.io/endpointslice => k8s.io/endpointslice v0.34.1
30+
k8s.io/externaljwt => k8s.io/externaljwt v0.34.1
31+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.1
32+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.1
33+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.1
34+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.1
35+
k8s.io/kubectl => k8s.io/kubectl v0.34.1
36+
k8s.io/kubelet => k8s.io/kubelet v0.34.1
37+
k8s.io/kubernetes => k8s.io/kubernetes v1.34.1
38+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.34.1
39+
k8s.io/metrics => k8s.io/metrics v0.34.1
40+
k8s.io/mount-utils => k8s.io/mount-utils v0.34.1
41+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.1
42+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.1
4143
)
4244

4345
require (
4446
github.com/google/go-containerregistry v0.20.2
4547
github.com/mattn/go-colorable v0.1.13
46-
github.com/rancher/lasso v0.2.3
48+
github.com/rancher/lasso v0.2.5
4749
github.com/rancher/permissions v0.0.0-20240924180251-69b0dcb34065
48-
github.com/rancher/wharfie v0.7.0
49-
github.com/rancher/wrangler/v3 v3.2.2
50+
github.com/rancher/wharfie v0.7.1-0.20251014190711-8cfe84a9efaa
51+
github.com/rancher/wrangler/v3 v3.3.1
5052
github.com/sirupsen/logrus v1.9.3
5153
github.com/urfave/cli/v2 v2.27.5
52-
golang.org/x/sync v0.12.0
53-
k8s.io/api v0.33.5
54-
k8s.io/apimachinery v0.33.5
55-
k8s.io/client-go v0.33.5
56-
k8s.io/kubernetes v1.33.5
57-
sigs.k8s.io/yaml v1.4.0
54+
golang.org/x/sync v0.17.0
55+
k8s.io/api v0.34.1
56+
k8s.io/apimachinery v0.34.1
57+
k8s.io/client-go v0.34.1
58+
k8s.io/kubernetes v1.34.1
59+
sigs.k8s.io/yaml v1.6.0
5860
)
5961

6062
require (
61-
cel.dev/expr v0.23.1 // indirect
63+
cel.dev/expr v0.24.0 // indirect
6264
github.com/Microsoft/go-winio v0.6.2 // indirect
6365
github.com/NYTimes/gziphandler v1.1.1 // indirect
6466
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
6567
github.com/beorn7/perks v1.0.1 // indirect
6668
github.com/blang/semver/v4 v4.0.0 // indirect
67-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
69+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
6870
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6971
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
7072
github.com/coreos/go-semver v0.3.1 // indirect
7173
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
72-
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
74+
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
7375
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7476
github.com/distribution/reference v0.6.0 // indirect
7577
github.com/docker/cli v27.1.1+incompatible // indirect
7678
github.com/docker/distribution v2.8.2+incompatible // indirect
7779
github.com/docker/docker-credential-helpers v0.7.0 // indirect
78-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
80+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
7981
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
8082
github.com/felixge/httpsnoop v1.0.4 // indirect
81-
github.com/fsnotify/fsnotify v1.7.0 // indirect
82-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
83-
github.com/go-logr/logr v1.4.2 // indirect
83+
github.com/fsnotify/fsnotify v1.9.0 // indirect
84+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
85+
github.com/go-logr/logr v1.4.3 // indirect
8486
github.com/go-logr/stdr v1.2.2 // indirect
8587
github.com/go-openapi/jsonpointer v0.21.0 // indirect
8688
github.com/go-openapi/jsonreference v0.21.0 // indirect
8789
github.com/go-openapi/swag v0.23.0 // indirect
8890
github.com/gogo/protobuf v1.3.2 // indirect
8991
github.com/golang/protobuf v1.5.4 // indirect
9092
github.com/google/btree v1.1.3 // indirect
91-
github.com/google/cel-go v0.25.0 // indirect
92-
github.com/google/gnostic-models v0.6.9 // indirect
93+
github.com/google/cel-go v0.26.0 // indirect
94+
github.com/google/gnostic-models v0.7.0 // indirect
9395
github.com/google/go-cmp v0.7.0 // indirect
9496
github.com/google/uuid v1.6.0 // indirect
9597
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
96-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
98+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
9799
github.com/inconshreveable/mousetrap v1.1.0 // indirect
98100
github.com/josharian/intern v1.0.0 // indirect
99101
github.com/json-iterator/go v1.1.12 // indirect
@@ -103,70 +105,73 @@ require (
103105
github.com/mattn/go-isatty v0.0.20 // indirect
104106
github.com/mitchellh/go-homedir v1.1.0 // indirect
105107
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
106-
github.com/modern-go/reflect2 v1.0.2 // indirect
108+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
107109
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
108110
github.com/opencontainers/go-digest v1.0.0 // indirect
109111
github.com/opencontainers/image-spec v1.1.1 // indirect
110112
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
111113
github.com/pkg/errors v0.9.1 // indirect
112-
github.com/prometheus/client_golang v1.22.0 // indirect
113-
github.com/prometheus/client_model v0.6.1 // indirect
114-
github.com/prometheus/common v0.62.0 // indirect
115-
github.com/prometheus/procfs v0.15.1 // indirect
114+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
115+
github.com/prometheus/client_golang v1.23.2 // indirect
116+
github.com/prometheus/client_model v0.6.2 // indirect
117+
github.com/prometheus/common v0.66.1 // indirect
118+
github.com/prometheus/procfs v0.16.1 // indirect
116119
github.com/russross/blackfriday/v2 v2.1.0 // indirect
117-
github.com/spf13/cobra v1.8.1 // indirect
118-
github.com/spf13/pflag v1.0.5 // indirect
120+
github.com/spf13/cobra v1.9.1 // indirect
121+
github.com/spf13/pflag v1.0.6 // indirect
119122
github.com/stoewer/go-strcase v1.3.0 // indirect
120123
github.com/vbatts/tar-split v0.11.3 // indirect
121124
github.com/x448/float16 v0.8.4 // indirect
122125
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
123-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
124-
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
125-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
126+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
127+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
128+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
126129
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
127-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
130+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
128131
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
129-
go.opentelemetry.io/otel v1.33.0 // indirect
130-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
131-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
132-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
133-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
134-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
135-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
132+
go.opentelemetry.io/otel v1.38.0 // indirect
133+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
134+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
135+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
136+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
137+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
138+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
136139
go.uber.org/multierr v1.11.0 // indirect
137140
go.uber.org/zap v1.27.0 // indirect
138-
golang.org/x/crypto v0.36.0 // indirect
141+
go.yaml.in/yaml/v2 v2.4.2 // indirect
142+
go.yaml.in/yaml/v3 v3.0.4 // indirect
143+
golang.org/x/crypto v0.42.0 // indirect
139144
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
140-
golang.org/x/net v0.38.0 // indirect
141-
golang.org/x/oauth2 v0.27.0 // indirect
142-
golang.org/x/sys v0.31.0 // indirect
143-
golang.org/x/term v0.30.0 // indirect
144-
golang.org/x/text v0.23.0 // indirect
145+
golang.org/x/net v0.44.0 // indirect
146+
golang.org/x/oauth2 v0.30.0 // indirect
147+
golang.org/x/sys v0.36.0 // indirect
148+
golang.org/x/term v0.35.0 // indirect
149+
golang.org/x/text v0.29.0 // indirect
145150
golang.org/x/time v0.9.0 // indirect
146-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
147-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
148-
google.golang.org/grpc v1.68.1 // indirect
149-
google.golang.org/protobuf v1.36.5 // indirect
151+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
152+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
153+
google.golang.org/grpc v1.75.0 // indirect
154+
google.golang.org/protobuf v1.36.8 // indirect
150155
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
151156
gopkg.in/inf.v0 v0.9.1 // indirect
152157
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
153158
gopkg.in/yaml.v2 v2.4.0 // indirect
154159
gopkg.in/yaml.v3 v3.0.1 // indirect
155-
k8s.io/apiextensions-apiserver v0.33.1 // indirect
156-
k8s.io/apiserver v0.33.5 // indirect
157-
k8s.io/cloud-provider v0.0.0 // indirect
158-
k8s.io/component-base v0.33.5 // indirect
159-
k8s.io/component-helpers v0.33.5 // indirect
160-
k8s.io/controller-manager v0.33.5 // indirect
161-
k8s.io/cri-api v0.33.5 // indirect
162-
k8s.io/cri-client v0.33.1 // indirect
160+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
161+
k8s.io/apiserver v0.34.1 // indirect
162+
k8s.io/cloud-provider v0.34.0 // indirect
163+
k8s.io/component-base v0.34.1 // indirect
164+
k8s.io/component-helpers v0.34.1 // indirect
165+
k8s.io/controller-manager v0.34.1 // indirect
166+
k8s.io/cri-api v0.34.1 // indirect
167+
k8s.io/cri-client v0.34.0 // indirect
163168
k8s.io/klog/v2 v2.130.1 // indirect
164-
k8s.io/kms v0.33.5 // indirect
165-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
166-
k8s.io/kubelet v0.24.2 // indirect
167-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
169+
k8s.io/kms v0.34.1 // indirect
170+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
171+
k8s.io/kubelet v0.34.0 // indirect
172+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
168173
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
169-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
174+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
170175
sigs.k8s.io/randfill v1.0.0 // indirect
171-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
176+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
172177
)

0 commit comments

Comments
 (0)