Skip to content

Commit 1efafa4

Browse files
Merge pull request #1292 from JoelSpeed/bump-1.31
OCPCLOUD-2738: Update dependencies to K8s 1.31
2 parents 050b12e + a57aee3 commit 1efafa4

File tree

2,174 files changed

+89738
-61603
lines changed

Some content is hidden

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

2,174 files changed

+89738
-61603
lines changed

go.mod

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,30 @@ toolchain go1.22.3
66

77
require (
88
github.com/blang/semver v3.5.1+incompatible
9-
github.com/go-logr/logr v1.4.1
9+
github.com/go-logr/logr v1.4.2
1010
github.com/google/uuid v1.6.0
11-
github.com/onsi/ginkgo/v2 v2.17.2
11+
github.com/onsi/ginkgo/v2 v2.19.0
1212
github.com/onsi/gomega v1.33.1
13-
github.com/openshift/api v0.0.0-20240904015708-69df64132c91
14-
github.com/openshift/client-go v0.0.0-20240904134955-cd42fd3d7408
15-
github.com/openshift/library-go v0.0.0-20240903143724-7c5c5d305ac1
16-
github.com/prometheus/client_golang v1.18.0
17-
github.com/spf13/cobra v1.8.0
13+
github.com/openshift/api v0.0.0-20240919193929-2669d1ebc910
14+
github.com/openshift/client-go v0.0.0-20240918182115-6a8ead8397fd
15+
github.com/openshift/library-go v0.0.0-20240919205913-c96b82b3762b
16+
github.com/prometheus/client_golang v1.19.1
17+
github.com/spf13/cobra v1.8.1
1818
github.com/spf13/pflag v1.0.5
1919
github.com/stretchr/testify v1.9.0
20-
github.com/vmware/govmomi v0.37.2
21-
golang.org/x/net v0.25.0
20+
github.com/vmware/govmomi v0.39.0
21+
golang.org/x/net v0.26.0
2222
gopkg.in/gcfg.v1 v1.2.3 // indirect
23-
k8s.io/api v0.30.1
24-
k8s.io/apimachinery v0.30.1
25-
k8s.io/apiserver v0.30.1
26-
k8s.io/client-go v0.30.1
27-
k8s.io/cloud-provider-vsphere v1.30.1
28-
k8s.io/klog/v2 v2.120.1
29-
k8s.io/kubectl v0.30.0
30-
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
23+
k8s.io/api v0.31.1
24+
k8s.io/apimachinery v0.31.1
25+
k8s.io/apiserver v0.31.1
26+
k8s.io/client-go v0.31.1
27+
k8s.io/cloud-provider-vsphere v1.31.0
28+
k8s.io/klog/v2 v2.130.1
29+
k8s.io/kubectl v0.31.1
30+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
3131
sigs.k8s.io/cluster-api v1.6.1
32-
sigs.k8s.io/controller-runtime v0.18.4
32+
sigs.k8s.io/controller-runtime v0.19.0
3333
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240522175850-2e9781e9fc60
3434
sigs.k8s.io/yaml v1.4.0
3535
)
@@ -39,7 +39,7 @@ require (
3939
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20240626103413-ddea9c7c0aca
4040
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20240909043600-373ac49835bf
4141
golang.org/x/time v0.5.0
42-
k8s.io/component-base v0.30.1
42+
k8s.io/component-base v0.31.1
4343
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96
4444
)
4545

@@ -76,7 +76,7 @@ require (
7676
github.com/butuzov/mirror v1.2.0 // indirect
7777
github.com/catenacyber/perfsprint v0.7.1 // indirect
7878
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
79-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
79+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8080
github.com/chai2010/gettext-go v1.0.2 // indirect
8181
github.com/charithe/durationcheck v0.0.10 // indirect
8282
github.com/chavacava/garif v0.1.0 // indirect
@@ -94,6 +94,7 @@ require (
9494
github.com/fatih/structtag v1.2.0 // indirect
9595
github.com/firefart/nonamedreturns v1.0.5 // indirect
9696
github.com/fsnotify/fsnotify v1.7.0 // indirect
97+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
9798
github.com/fzipp/gocyclo v0.6.0 // indirect
9899
github.com/ghostiam/protogetter v0.3.6 // indirect
99100
github.com/go-critic/go-critic v0.11.3 // indirect
@@ -129,7 +130,7 @@ require (
129130
github.com/google/gnostic-models v0.6.8 // indirect
130131
github.com/google/go-cmp v0.6.0 // indirect
131132
github.com/google/gofuzz v1.2.0 // indirect
132-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
133+
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
133134
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
134135
github.com/gordonklaus/ineffassign v0.1.0 // indirect
135136
github.com/gorilla/websocket v1.5.0 // indirect
@@ -171,12 +172,11 @@ require (
171172
github.com/mattn/go-colorable v0.1.13 // indirect
172173
github.com/mattn/go-isatty v0.0.20 // indirect
173174
github.com/mattn/go-runewidth v0.0.14 // indirect
174-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
175175
github.com/mgechev/revive v1.3.7 // indirect
176176
github.com/mitchellh/go-homedir v1.1.0 // indirect
177177
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
178178
github.com/mitchellh/mapstructure v1.5.0 // indirect
179-
github.com/moby/spdystream v0.2.0 // indirect
179+
github.com/moby/spdystream v0.4.0 // indirect
180180
github.com/moby/term v0.5.0 // indirect
181181
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
182182
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -194,9 +194,9 @@ require (
194194
github.com/pkg/errors v0.9.1 // indirect
195195
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
196196
github.com/polyfloyd/go-errorlint v1.5.1 // indirect
197-
github.com/prometheus/client_model v0.5.0 // indirect
198-
github.com/prometheus/common v0.45.0 // indirect
199-
github.com/prometheus/procfs v0.12.0 // indirect
197+
github.com/prometheus/client_model v0.6.1 // indirect
198+
github.com/prometheus/common v0.55.0 // indirect
199+
github.com/prometheus/procfs v0.15.1 // indirect
200200
github.com/quasilyte/go-ruleguard v0.4.2 // indirect
201201
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
202202
github.com/quasilyte/gogrep v0.5.0 // indirect
@@ -238,6 +238,7 @@ require (
238238
github.com/ultraware/funlen v0.1.0 // indirect
239239
github.com/ultraware/whitespace v0.1.1 // indirect
240240
github.com/uudashr/gocognit v1.1.2 // indirect
241+
github.com/x448/float16 v0.8.4 // indirect
241242
github.com/xen0n/gosmopolitan v1.2.2 // indirect
242243
github.com/xlab/treeprint v1.2.0 // indirect
243244
github.com/yagipy/maintidx v1.0.0 // indirect
@@ -253,29 +254,29 @@ require (
253254
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
254255
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
255256
golang.org/x/mod v0.17.0 // indirect
256-
golang.org/x/oauth2 v0.18.0 // indirect
257+
golang.org/x/oauth2 v0.21.0 // indirect
257258
golang.org/x/sync v0.7.0 // indirect
258-
golang.org/x/sys v0.20.0 // indirect
259-
golang.org/x/term v0.20.0 // indirect
260-
golang.org/x/text v0.15.0 // indirect
261-
golang.org/x/tools v0.21.0 // indirect
259+
golang.org/x/sys v0.21.0 // indirect
260+
golang.org/x/term v0.21.0 // indirect
261+
golang.org/x/text v0.16.0 // indirect
262+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
262263
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
263-
google.golang.org/appengine v1.6.8 // indirect
264-
google.golang.org/protobuf v1.33.0 // indirect
264+
google.golang.org/protobuf v1.34.2 // indirect
265+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
265266
gopkg.in/inf.v0 v0.9.1 // indirect
266267
gopkg.in/ini.v1 v1.67.0 // indirect
267268
gopkg.in/warnings.v0 v0.1.2 // indirect
268269
gopkg.in/yaml.v2 v2.4.0 // indirect
269270
gopkg.in/yaml.v3 v3.0.1 // indirect
270271
honnef.co/go/tools v0.4.7 // indirect
271-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
272-
k8s.io/cli-runtime v0.30.0 // indirect
272+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
273+
k8s.io/cli-runtime v0.31.1 // indirect
273274
k8s.io/kube-aggregator v0.30.1 // indirect
274275
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
275276
mvdan.cc/gofumpt v0.6.0 // indirect
276277
mvdan.cc/unparam v0.0.0-20240427195214-063aff900ca1 // indirect
277278
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
278-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
279-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
279+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
280+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
280281
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
281282
)

0 commit comments

Comments
 (0)