Skip to content

Commit 0445f05

Browse files
authored
Merge pull request #4 from alauda/fix/AIT-43698
fix: AIT-43698, upgrade module versions to fix CVEs
2 parents 1f6c07c + 35a835b commit 0445f05

File tree

2 files changed

+1048
-183
lines changed

2 files changed

+1048
-183
lines changed

go.mod

+32-25
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ require (
1313
github.com/Azure/go-autorest/tracing v0.6.0
1414
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
1515
github.com/blang/semver v3.5.1+incompatible
16-
github.com/go-logr/logr v1.2.4
16+
github.com/go-logr/logr v1.4.1
1717
github.com/golang/mock v1.6.0
18-
github.com/google/go-cmp v0.5.9
18+
github.com/google/go-cmp v0.6.0
1919
github.com/google/uuid v1.3.0
2020
github.com/hashicorp/go-retryablehttp v0.7.4
2121
github.com/hashicorp/golang-lru v0.5.4
@@ -27,15 +27,15 @@ require (
2727
github.com/prometheus/client_golang v1.16.0
2828
github.com/spf13/pflag v1.0.5
2929
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0
30-
go.opentelemetry.io/otel v1.16.0
30+
go.opentelemetry.io/otel v1.24.0
3131
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
3232
go.opentelemetry.io/otel/exporters/prometheus v0.39.0
33-
go.opentelemetry.io/otel/sdk v1.16.0
33+
go.opentelemetry.io/otel/sdk v1.24.0
3434
go.opentelemetry.io/otel/sdk/metric v0.39.0
35-
go.opentelemetry.io/otel/trace v1.16.0
36-
golang.org/x/crypto v0.11.0
35+
go.opentelemetry.io/otel/trace v1.24.0
36+
golang.org/x/crypto v0.14.0
3737
golang.org/x/mod v0.12.0
38-
golang.org/x/text v0.12.0
38+
golang.org/x/text v0.14.0
3939
k8s.io/api v0.26.2
4040
k8s.io/apimachinery v0.26.2
4141
k8s.io/client-go v0.26.2
@@ -110,11 +110,11 @@ require (
110110
github.com/google/go-github/v48 v48.2.0 // indirect
111111
github.com/google/go-querystring v1.1.0 // indirect
112112
github.com/google/gofuzz v1.2.0 // indirect
113-
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
113+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
114114
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
115115
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
116116
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
117-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect
117+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
118118
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
119119
github.com/hashicorp/hcl v1.0.0 // indirect
120120
github.com/huandu/xstrings v1.4.0 // indirect
@@ -160,25 +160,23 @@ require (
160160
github.com/subosito/gotenv v1.4.2 // indirect
161161
github.com/valyala/fastjson v1.6.4 // indirect
162162
github.com/xlab/treeprint v1.1.0 // indirect
163-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
164-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
165-
go.opentelemetry.io/otel/metric v1.16.0 // indirect
166-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
163+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
164+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
165+
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
167166
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
168-
golang.org/x/exp v0.0.0-20220414153411-bcd21879b8fd // indirect
169-
golang.org/x/net v0.13.0 // indirect
170-
golang.org/x/oauth2 v0.10.0 // indirect
171-
golang.org/x/sys v0.10.0 // indirect
172-
golang.org/x/term v0.10.0 // indirect
167+
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
168+
golang.org/x/net v0.19.0 // indirect
169+
golang.org/x/oauth2 v0.15.0 // indirect
170+
golang.org/x/sys v0.17.0 // indirect
171+
golang.org/x/term v0.15.0 // indirect
173172
golang.org/x/time v0.3.0 // indirect
174173
golang.org/x/tools v0.9.3 // indirect
175174
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
176-
google.golang.org/appengine v1.6.7 // indirect
177-
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
178-
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
179-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
180-
google.golang.org/grpc v1.57.0 // indirect
181-
google.golang.org/protobuf v1.31.0 // indirect
175+
google.golang.org/appengine v1.6.8 // indirect
176+
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
177+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
178+
google.golang.org/grpc v1.61.1 // indirect
179+
google.golang.org/protobuf v1.32.0 // indirect
182180
gopkg.in/inf.v0 v0.9.1 // indirect
183181
gopkg.in/ini.v1 v1.67.0 // indirect
184182
gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -197,4 +195,13 @@ require (
197195
sigs.k8s.io/yaml v1.3.0 // indirect
198196
)
199197

200-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.6
198+
replace (
199+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0
200+
go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.24.0
201+
go.opentelemetry.io/otel/exporters/otlp/otlptrace => go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0
202+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0
203+
golang.org/x/crypto => golang.org/x/crypto v0.17.0
204+
golang.org/x/net => golang.org/x/net v0.17.0
205+
google.golang.org/grpc => google.golang.org/grpc v1.57.1
206+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.6
207+
)

0 commit comments

Comments
 (0)