Skip to content

Commit c2420d8

Browse files
Merge pull request openshift#7970 from r4f4/bump-k8s-deps
CORS-3188: Bump k8s deps
2 parents 056cd84 + ec3af73 commit c2420d8

File tree

909 files changed

+39613
-21611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

909 files changed

+39613
-21611
lines changed

go.mod

Lines changed: 53 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/openshift/installer
33
go 1.21
44

55
require (
6-
cloud.google.com/go/monitoring v1.16.0
6+
cloud.google.com/go/monitoring v1.17.0
77
github.com/AlecAivazis/survey/v2 v2.3.5
88
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
99
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0-beta.1
@@ -36,13 +36,13 @@ require (
3636
github.com/form3tech-oss/jwt-go v3.2.3+incompatible
3737
github.com/go-openapi/errors v0.20.4
3838
github.com/go-openapi/strfmt v0.21.7
39-
github.com/go-openapi/swag v0.22.4
39+
github.com/go-openapi/swag v0.22.9
4040
github.com/go-playground/validator/v10 v10.13.0
4141
github.com/golang-jwt/jwt v3.2.2+incompatible
4242
github.com/golang/mock v1.7.0-rc.1
4343
github.com/golang/protobuf v1.5.3
4444
github.com/google/go-cmp v0.6.0
45-
github.com/google/uuid v1.4.0
45+
github.com/google/uuid v1.6.0
4646
github.com/gophercloud/gophercloud v1.6.0
4747
github.com/gophercloud/utils v0.0.0-20230523080330-de873b9cf00d
4848
github.com/h2non/filetype v1.0.12
@@ -79,46 +79,46 @@ require (
7979
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e
8080
github.com/pkg/errors v0.9.1
8181
github.com/pkg/sftp v1.13.6
82-
github.com/prometheus/client_golang v1.17.0
83-
github.com/prometheus/common v0.44.0
82+
github.com/prometheus/client_golang v1.18.0
83+
github.com/prometheus/common v0.46.0
8484
github.com/rogpeppe/go-internal v1.11.0
8585
github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
8686
github.com/sirupsen/logrus v1.9.3
87-
github.com/spf13/cobra v1.7.0
87+
github.com/spf13/cobra v1.8.0
8888
github.com/stretchr/testify v1.8.4
8989
github.com/thedevsaddam/retry v0.0.0-20200324223450-9769a859cc6d
9090
github.com/ulikunitz/xz v0.5.11
9191
github.com/vincent-petithory/dataurl v1.0.0
9292
github.com/vmware/govmomi v0.30.4
93-
golang.org/x/crypto v0.14.0
94-
golang.org/x/oauth2 v0.13.0
95-
golang.org/x/sync v0.4.0
96-
golang.org/x/sys v0.13.0
97-
golang.org/x/term v0.13.0
98-
google.golang.org/api v0.148.0
99-
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97
100-
google.golang.org/grpc v1.59.0
93+
golang.org/x/crypto v0.18.0
94+
golang.org/x/oauth2 v0.16.0
95+
golang.org/x/sync v0.6.0
96+
golang.org/x/sys v0.16.0
97+
golang.org/x/term v0.16.0
98+
google.golang.org/api v0.149.0
99+
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe
100+
google.golang.org/grpc v1.61.0
101101
gopkg.in/ini.v1 v1.67.0
102102
gopkg.in/yaml.v2 v2.4.0
103-
k8s.io/api v0.29.0
104-
k8s.io/apiextensions-apiserver v0.28.3
105-
k8s.io/apimachinery v0.29.0
106-
k8s.io/client-go v12.0.0+incompatible
103+
k8s.io/api v0.29.1
104+
k8s.io/apiextensions-apiserver v0.29.1
105+
k8s.io/apimachinery v0.29.1
106+
k8s.io/client-go v0.29.1
107107
k8s.io/cloud-provider-vsphere v0.0.0
108108
k8s.io/klog v1.0.0
109-
k8s.io/klog/v2 v2.110.1
110-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
109+
k8s.io/klog/v2 v2.120.1
110+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
111111
sigs.k8s.io/cluster-api v1.5.3
112112
sigs.k8s.io/cluster-api-provider-aws/v2 v2.0.0-00010101000000-000000000000
113113
sigs.k8s.io/cluster-api-provider-azure v0.0.0-00010101000000-000000000000
114114
sigs.k8s.io/cluster-api-provider-gcp v1.5.0
115115
sigs.k8s.io/controller-runtime v0.16.2
116116
sigs.k8s.io/controller-tools v0.12.0
117-
sigs.k8s.io/yaml v1.3.0
117+
sigs.k8s.io/yaml v1.4.0
118118
)
119119

120120
require (
121-
cloud.google.com/go/compute v1.23.1 // indirect
121+
cloud.google.com/go/compute v1.23.3 // indirect
122122
cloud.google.com/go/compute/metadata v0.2.3 // indirect
123123
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
124124
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.2.0 // indirect
@@ -150,19 +150,19 @@ require (
150150
github.com/davecgh/go-spew v1.1.1 // indirect
151151
github.com/dimchansky/utfbom v1.1.1 // indirect
152152
github.com/elliotwutingfeng/asciiset v0.0.0-20230602022725-51bbb787efab // indirect
153-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
153+
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
154154
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
155155
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
156156
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
157157
github.com/fatih/color v1.15.0 // indirect
158158
github.com/fsnotify/fsnotify v1.7.0 // indirect
159159
github.com/go-errors/errors v1.4.2 // indirect
160-
github.com/go-logr/logr v1.3.0 // indirect
160+
github.com/go-logr/logr v1.4.1 // indirect
161161
github.com/go-logr/stdr v1.2.2 // indirect
162162
github.com/go-logr/zapr v1.2.4 // indirect
163163
github.com/go-openapi/analysis v0.21.4 // indirect
164-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
165-
github.com/go-openapi/jsonreference v0.20.2 // indirect
164+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
165+
github.com/go-openapi/jsonreference v0.20.4 // indirect
166166
github.com/go-openapi/loads v0.21.2 // indirect
167167
github.com/go-openapi/runtime v0.26.0 // indirect
168168
github.com/go-openapi/spec v0.20.8 // indirect
@@ -175,20 +175,22 @@ require (
175175
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
176176
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
177177
github.com/google/btree v1.0.1 // indirect
178+
github.com/google/cel-go v0.19.0 // indirect
178179
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
179180
github.com/google/gofuzz v1.2.0 // indirect
180181
github.com/google/s2a-go v0.1.7 // indirect
181182
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
182-
github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
183+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
183184
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
185+
github.com/gorilla/websocket v1.5.0 // indirect
184186
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
185187
github.com/hashicorp/errwrap v1.1.0 // indirect
186188
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
187189
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
188190
github.com/hashicorp/go-uuid v1.0.3 // indirect
189191
github.com/hashicorp/terraform-json v0.14.0 // indirect
190192
github.com/hexops/gotextdiff v1.0.3 // indirect
191-
github.com/imdario/mergo v0.3.13 // indirect
193+
github.com/imdario/mergo v0.3.16 // indirect
192194
github.com/inconshreveable/mousetrap v1.1.0 // indirect
193195
github.com/jinzhu/inflection v1.0.0 // indirect
194196
github.com/jinzhu/now v1.1.4 // indirect
@@ -203,7 +205,6 @@ require (
203205
github.com/mailru/easyjson v0.7.7 // indirect
204206
github.com/mattn/go-colorable v0.1.13 // indirect
205207
github.com/mattn/go-isatty v0.0.17 // indirect
206-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
207208
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
208209
github.com/microsoft/kiota-abstractions-go v0.14.0 // indirect
209210
github.com/microsoft/kiota-http-go v0.9.0 // indirect
@@ -219,6 +220,7 @@ require (
219220
github.com/modern-go/reflect2 v1.0.2 // indirect
220221
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
221222
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
223+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
222224
github.com/oklog/ulid v1.3.1 // indirect
223225
github.com/opencontainers/go-digest v1.0.0 // indirect
224226
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
@@ -231,43 +233,46 @@ require (
231233
github.com/pkg/xattr v0.4.9 // indirect
232234
github.com/pmezard/go-difflib v1.0.0 // indirect
233235
github.com/prometheus/client_model v0.5.0 // indirect
234-
github.com/prometheus/procfs v0.11.1 // indirect
236+
github.com/prometheus/procfs v0.12.0 // indirect
235237
github.com/russross/blackfriday/v2 v2.1.0 // indirect
236238
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
237239
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
240+
github.com/stoewer/go-strcase v1.3.0 // indirect
238241
github.com/xlab/treeprint v1.2.0 // indirect
239242
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
240243
github.com/zclconf/go-cty v1.11.0 // indirect
241244
go.mongodb.org/mongo-driver v1.11.3 // indirect
242245
go.opencensus.io v0.24.0 // indirect
243-
go.opentelemetry.io/otel v1.19.0 // indirect
244-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
245-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
246+
go.opentelemetry.io/otel v1.22.0 // indirect
247+
go.opentelemetry.io/otel/metric v1.22.0 // indirect
248+
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
249+
go.opentelemetry.io/otel/trace v1.22.0 // indirect
246250
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
251+
go.uber.org/goleak v1.3.0 // indirect
247252
go.uber.org/multierr v1.11.0 // indirect
248253
go.uber.org/zap v1.26.0 // indirect
249-
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
250-
golang.org/x/mod v0.13.0 // indirect
251-
golang.org/x/net v0.17.0 // indirect
252-
golang.org/x/text v0.13.0 // indirect
253-
golang.org/x/time v0.3.0 // indirect
254-
golang.org/x/tools v0.13.0 // indirect
254+
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
255+
golang.org/x/mod v0.14.0 // indirect
256+
golang.org/x/net v0.20.0 // indirect
257+
golang.org/x/text v0.14.0 // indirect
258+
golang.org/x/time v0.5.0 // indirect
259+
golang.org/x/tools v0.17.0 // indirect
255260
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
256-
google.golang.org/appengine v1.6.7 // indirect
257-
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
258-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect
259-
google.golang.org/protobuf v1.31.0 // indirect
261+
google.golang.org/appengine v1.6.8 // indirect
262+
google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect
263+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
264+
google.golang.org/protobuf v1.32.0 // indirect
260265
gopkg.in/djherbis/times.v1 v1.3.0 // indirect
261266
gopkg.in/gcfg.v1 v1.2.3 // indirect
262267
gopkg.in/inf.v0 v0.9.1 // indirect
263268
gopkg.in/warnings.v0 v0.1.2 // indirect
264269
gopkg.in/yaml.v3 v3.0.1 // indirect
265270
gorm.io/gorm v1.24.5 // indirect
266-
k8s.io/cli-runtime v0.28.2 // indirect
267-
k8s.io/cluster-bootstrap v0.27.2 // indirect
268-
k8s.io/component-base v0.28.3 // indirect
269-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
270-
k8s.io/kubectl v0.28.2 // indirect
271+
k8s.io/cli-runtime v0.29.1 // indirect
272+
k8s.io/cluster-bootstrap v0.29.1 // indirect
273+
k8s.io/component-base v0.29.1 // indirect
274+
k8s.io/kube-openapi v0.0.0-20240126223410-2919ad4fcfec // indirect
275+
k8s.io/kubectl v0.29.1 // indirect
271276
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
272277
sigs.k8s.io/kustomize/api v0.14.0 // indirect
273278
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
@@ -285,11 +290,6 @@ replace (
285290
// sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210626224711-5d94c794092f // Indirect dependency through MAO from cluster API providers
286291
)
287292

288-
replace (
289-
k8s.io/api => k8s.io/api v0.28.3
290-
k8s.io/apimachinery => k8s.io/apimachinery v0.28.3
291-
)
292-
293293
replace sigs.k8s.io/cluster-api-provider-aws/v2 => sigs.k8s.io/cluster-api-provider-aws/v2 v2.0.0-20231024062453-0bf78b04b305
294294

295295
replace sigs.k8s.io/cluster-api-provider-azure => sigs.k8s.io/cluster-api-provider-azure v1.11.1-0.20231026140308-a3f4914170d9
@@ -299,10 +299,6 @@ replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.16.1
299299
// Pin MCO so it doesn't get downgraded
300300
replace github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20201009041932-4fe8559913b8
301301

302-
// Needed because machine-api-operator uses a "later" v12 version, which is actually an earlier version.
303-
// This should be kept in line with the k8s version used.
304-
replace k8s.io/client-go => k8s.io/client-go v0.28.3
305-
306302
// Needed so that the InstallConfig CRD can be created. Later versions of controller-gen balk at using IPNet as a field.
307303
replace sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.3.1-0.20200617211605-651903477185
308304

0 commit comments

Comments
 (0)