Skip to content

Commit ec20a41

Browse files
author
zgjia
committed
fix: AIT-43698, upgrade module versions to fix CVEs
Signed-off-by: zgjia <[email protected]>
1 parent 1f6c07c commit ec20a41

File tree

2 files changed

+1086
-56
lines changed

2 files changed

+1086
-56
lines changed

go.mod

+62-56
Original file line numberDiff line numberDiff line change
@@ -5,53 +5,53 @@ go 1.20
55
require (
66
github.com/Azure/aad-pod-identity v1.8.17
77
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
8-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1
9-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0
10-
github.com/Azure/azure-service-operator/v2 v2.1.0
8+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0
9+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0
10+
github.com/Azure/azure-service-operator/v2 v2.5.0
1111
github.com/Azure/go-autorest/autorest v0.11.29
1212
github.com/Azure/go-autorest/autorest/azure/auth v0.5.12
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.3.0
1717
github.com/golang/mock v1.6.0
18-
github.com/google/go-cmp v0.5.9
19-
github.com/google/uuid v1.3.0
18+
github.com/google/go-cmp v0.6.0
19+
github.com/google/uuid v1.4.0
2020
github.com/hashicorp/go-retryablehttp v0.7.4
2121
github.com/hashicorp/golang-lru v0.5.4
2222
github.com/jongio/azidext/go/azidext v0.5.0
23-
github.com/onsi/ginkgo/v2 v2.11.0
24-
github.com/onsi/gomega v1.27.8
23+
github.com/onsi/ginkgo/v2 v2.13.0
24+
github.com/onsi/gomega v1.30.0
2525
github.com/pkg/errors v0.9.1
2626
github.com/pkg/sftp v1.13.5
27-
github.com/prometheus/client_golang v1.16.0
27+
github.com/prometheus/client_golang v1.17.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.18.0
3131
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
3232
go.opentelemetry.io/otel/exporters/prometheus v0.39.0
3333
go.opentelemetry.io/otel/sdk v1.16.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
37-
golang.org/x/mod v0.12.0
38-
golang.org/x/text v0.12.0
39-
k8s.io/api v0.26.2
40-
k8s.io/apimachinery v0.26.2
41-
k8s.io/client-go v0.26.2
42-
k8s.io/component-base v0.26.2
43-
k8s.io/klog/v2 v2.90.1
35+
go.opentelemetry.io/otel/trace v1.18.0
36+
golang.org/x/crypto v0.15.0
37+
golang.org/x/mod v0.13.0
38+
golang.org/x/text v0.14.0
39+
k8s.io/api v0.28.4
40+
k8s.io/apimachinery v0.28.4
41+
k8s.io/client-go v0.28.4
42+
k8s.io/component-base v0.28.4
43+
k8s.io/klog/v2 v2.110.1
4444
k8s.io/kubectl v0.26.1
45-
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
45+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
4646
sigs.k8s.io/cloud-provider-azure v1.26.7
4747
sigs.k8s.io/cluster-api v1.4.6
4848
sigs.k8s.io/cluster-api/test v1.4.6
49-
sigs.k8s.io/controller-runtime v0.14.5
49+
sigs.k8s.io/controller-runtime v0.16.3
5050
sigs.k8s.io/kind v0.20.0
5151
)
5252

5353
require (
54-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
54+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 // indirect
5555
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
5656
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
5757
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
@@ -61,7 +61,7 @@ require (
6161
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
6262
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
6363
github.com/Azure/go-autorest/logger v0.2.1 // indirect
64-
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
64+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 // indirect
6565
github.com/BurntSushi/toml v1.2.1 // indirect
6666
github.com/MakeNowJust/heredoc v1.0.0 // indirect
6767
github.com/Masterminds/goutils v1.1.1 // indirect
@@ -70,7 +70,7 @@ require (
7070
github.com/Microsoft/go-winio v0.6.0 // indirect
7171
github.com/alessio/shellescape v1.4.1 // indirect
7272
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
73-
github.com/benbjohnson/clock v1.1.0 // indirect
73+
github.com/benbjohnson/clock v1.3.5 // indirect
7474
github.com/beorn7/perks v1.0.1 // indirect
7575
github.com/blang/semver/v4 v4.0.0 // indirect
7676
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
@@ -85,18 +85,18 @@ require (
8585
github.com/docker/go-connections v0.4.0 // indirect
8686
github.com/docker/go-units v0.5.0 // indirect
8787
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
88-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
89-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
90-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
88+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
89+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
90+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
9191
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
9292
github.com/fatih/camelcase v1.0.0 // indirect
9393
github.com/felixge/httpsnoop v1.0.3 // indirect
94-
github.com/fsnotify/fsnotify v1.6.0 // indirect
94+
github.com/fsnotify/fsnotify v1.7.0 // indirect
9595
github.com/go-errors/errors v1.0.1 // indirect
9696
github.com/go-logr/stdr v1.2.2 // indirect
97-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
98-
github.com/go-openapi/jsonreference v0.20.0 // indirect
99-
github.com/go-openapi/swag v0.22.3 // indirect
97+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
98+
github.com/go-openapi/jsonreference v0.20.2 // indirect
99+
github.com/go-openapi/swag v0.22.4 // indirect
100100
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
101101
github.com/gobuffalo/flect v1.0.2 // indirect
102102
github.com/gofrs/uuid v4.2.0+incompatible // indirect
@@ -105,21 +105,21 @@ require (
105105
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
106106
github.com/golang/protobuf v1.5.3 // indirect
107107
github.com/google/btree v1.0.1 // indirect
108-
github.com/google/cel-go v0.12.6 // indirect
108+
github.com/google/cel-go v0.16.1 // indirect
109109
github.com/google/gnostic v0.6.9 // indirect
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
117117
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // 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
121-
github.com/imdario/mergo v0.3.13 // indirect
122-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
121+
github.com/imdario/mergo v0.3.16 // indirect
122+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
123123
github.com/josharian/intern v1.0.0 // indirect
124124
github.com/json-iterator/go v1.1.12 // indirect
125125
github.com/kr/fs v0.1.0 // indirect
@@ -146,14 +146,14 @@ require (
146146
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
147147
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
148148
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
149-
github.com/prometheus/client_model v0.4.0 // indirect
150-
github.com/prometheus/common v0.44.0 // indirect
151-
github.com/prometheus/procfs v0.11.1 // indirect
149+
github.com/prometheus/client_model v0.5.0 // indirect
150+
github.com/prometheus/common v0.45.0 // indirect
151+
github.com/prometheus/procfs v0.12.0 // indirect
152152
github.com/russross/blackfriday/v2 v2.1.0 // indirect
153153
github.com/shopspring/decimal v1.3.1 // indirect
154154
github.com/spf13/afero v1.9.3 // indirect
155155
github.com/spf13/cast v1.5.0 // indirect
156-
github.com/spf13/cobra v1.6.1 // indirect
156+
github.com/spf13/cobra v1.8.0 // indirect
157157
github.com/spf13/jwalterweatherman v1.1.0 // indirect
158158
github.com/spf13/viper v1.15.0 // indirect
159159
github.com/stoewer/go-strcase v1.2.0 // indirect
@@ -162,18 +162,18 @@ require (
162162
github.com/xlab/treeprint v1.1.0 // indirect
163163
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
164164
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
165-
go.opentelemetry.io/otel/metric v1.16.0 // indirect
165+
go.opentelemetry.io/otel/metric v1.18.0 // indirect
166166
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
167167
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
173-
golang.org/x/time v0.3.0 // indirect
174-
golang.org/x/tools v0.9.3 // indirect
175-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
176-
google.golang.org/appengine v1.6.7 // indirect
168+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
169+
golang.org/x/net v0.17.0 // indirect
170+
golang.org/x/oauth2 v0.13.0 // indirect
171+
golang.org/x/sys v0.15.0 // indirect
172+
golang.org/x/term v0.15.0 // indirect
173+
golang.org/x/time v0.5.0 // indirect
174+
golang.org/x/tools v0.14.0 // indirect
175+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
176+
google.golang.org/appengine v1.6.8 // indirect
177177
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
178178
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
179179
google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
@@ -183,18 +183,24 @@ require (
183183
gopkg.in/ini.v1 v1.67.0 // indirect
184184
gopkg.in/yaml.v2 v2.4.0 // indirect
185185
gopkg.in/yaml.v3 v3.0.1 // indirect
186-
k8s.io/apiextensions-apiserver v0.26.1 // indirect
187-
k8s.io/apiserver v0.26.2 // indirect
186+
k8s.io/apiextensions-apiserver v0.28.4 // indirect
187+
k8s.io/apiserver v0.28.4 // indirect
188188
k8s.io/cli-runtime v0.26.1 // indirect
189189
k8s.io/cloud-provider v0.26.2 // indirect
190190
k8s.io/cluster-bootstrap v0.25.0 // indirect
191191
k8s.io/component-helpers v0.26.2 // indirect
192-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
193-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
192+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
193+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
194194
sigs.k8s.io/kustomize/api v0.12.1 // indirect
195195
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
196-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
197-
sigs.k8s.io/yaml v1.3.0 // indirect
196+
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
197+
sigs.k8s.io/yaml v1.4.0 // indirect
198198
)
199199

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

0 commit comments

Comments
 (0)