Skip to content

Commit 0ba1796

Browse files
Merge pull request #211 from mandre/bump-deps
Bug 2037484: Bump k8s to 1.23
2 parents 2b22d5f + 1b44fe6 commit 0ba1796

File tree

889 files changed

+105411
-25395
lines changed

Some content is hidden

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

889 files changed

+105411
-25395
lines changed

cmd/manager/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
configv1 "github.com/openshift/api/config/v1"
2626
machinev1 "github.com/openshift/api/machine/v1beta1"
2727
"github.com/openshift/machine-api-operator/pkg/metrics"
28-
"k8s.io/klog/klogr"
2928
"k8s.io/klog/v2"
29+
"k8s.io/klog/v2/klogr"
3030
"sigs.k8s.io/cluster-api-provider-openstack/pkg/apis"
3131
"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/machineset"
3232
"sigs.k8s.io/cluster-api-provider-openstack/pkg/controller"

config/testcrds/machineset.openshift.io.crd.yaml

Lines changed: 309 additions & 99 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,22 @@ go 1.17
44

55
require (
66
github.com/coreos/container-linux-config-transpiler v0.9.0
7-
github.com/go-logr/logr v0.4.0
7+
github.com/go-logr/logr v1.2.2
88
github.com/gophercloud/gophercloud v0.19.0
99
github.com/gophercloud/utils v0.0.0-20210720165645-8a3ad2ad9e70
10-
github.com/onsi/ginkgo v1.16.4
11-
github.com/onsi/gomega v1.14.0
12-
github.com/openshift/api v0.0.0-20211108165917-be1be0e89115
13-
github.com/openshift/client-go v0.0.0-20211025111749-96ca2abfc56c
14-
github.com/openshift/machine-api-operator v0.2.1-0.20211111133920-c8bba3e64310
10+
github.com/onsi/ginkgo v1.16.5
11+
github.com/onsi/gomega v1.17.0
12+
github.com/openshift/api v0.0.0-20211222145011-3bf13cf5081a
13+
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3
14+
github.com/openshift/machine-api-operator v0.2.1-0.20211223185609-7ba373c29f8f
1515
gopkg.in/yaml.v2 v2.4.0
16-
k8s.io/api v0.22.1
17-
k8s.io/apimachinery v0.22.1
18-
k8s.io/client-go v0.22.1
16+
k8s.io/api v0.23.0
17+
k8s.io/apimachinery v0.23.0
18+
k8s.io/client-go v0.23.0
1919
k8s.io/cluster-bootstrap v0.0.0-20190202014938-c9acc0c1bea2
20-
k8s.io/klog v1.0.0
21-
k8s.io/klog/v2 v2.9.0
22-
sigs.k8s.io/controller-runtime v0.9.6
23-
sigs.k8s.io/yaml v1.2.0
20+
k8s.io/klog/v2 v2.30.0
21+
sigs.k8s.io/controller-runtime v0.11.0
22+
sigs.k8s.io/yaml v1.3.0
2423
)
2524

2625
require (
@@ -33,13 +32,14 @@ require (
3332
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
3433
github.com/beorn7/perks v1.0.1 // indirect
3534
github.com/cespare/xxhash/v2 v2.1.1 // indirect
35+
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
3636
github.com/coreos/go-semver v0.3.0 // indirect
3737
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
3838
github.com/coreos/ignition v0.33.0 // indirect
3939
github.com/davecgh/go-spew v1.1.1 // indirect
40-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
40+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
4141
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
42-
github.com/fsnotify/fsnotify v1.4.9 // indirect
42+
github.com/fsnotify/fsnotify v1.5.1 // indirect
4343
github.com/go-errors/errors v1.0.1 // indirect
4444
github.com/go-openapi/jsonpointer v0.19.5 // indirect
4545
github.com/go-openapi/jsonreference v0.19.5 // indirect
@@ -49,15 +49,15 @@ require (
4949
github.com/golang/protobuf v1.5.2 // indirect
5050
github.com/google/btree v1.0.1 // indirect
5151
github.com/google/go-cmp v0.5.6 // indirect
52-
github.com/google/gofuzz v1.1.0 // indirect
52+
github.com/google/gofuzz v1.2.0 // indirect
5353
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5454
github.com/google/uuid v1.1.2 // indirect
5555
github.com/googleapis/gnostic v0.5.5 // indirect
5656
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
5757
github.com/imdario/mergo v0.3.12 // indirect
5858
github.com/inconshreveable/mousetrap v1.0.0 // indirect
5959
github.com/josharian/intern v1.0.0 // indirect
60-
github.com/json-iterator/go v1.1.11 // indirect
60+
github.com/json-iterator/go v1.1.12 // indirect
6161
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
6262
github.com/mailru/easyjson v0.7.6 // indirect
6363
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
@@ -66,15 +66,16 @@ require (
6666
github.com/moby/spdystream v0.2.0 // indirect
6767
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
6868
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
69-
github.com/modern-go/reflect2 v1.0.1 // indirect
69+
github.com/modern-go/reflect2 v1.0.2 // indirect
7070
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7171
github.com/nxadm/tail v1.4.8 // indirect
72+
github.com/openshift/library-go v0.0.0-20211220195323-eca2c467c492 // indirect
7273
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7374
github.com/pkg/errors v0.9.1 // indirect
7475
github.com/pmezard/go-difflib v1.0.0 // indirect
7576
github.com/prometheus/client_golang v1.11.0 // indirect
7677
github.com/prometheus/client_model v0.2.0 // indirect
77-
github.com/prometheus/common v0.26.0 // indirect
78+
github.com/prometheus/common v0.28.0 // indirect
7879
github.com/prometheus/procfs v0.6.0 // indirect
7980
github.com/russross/blackfriday v1.5.2 // indirect
8081
github.com/spf13/cobra v1.2.1 // indirect
@@ -84,25 +85,26 @@ require (
8485
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
8586
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
8687
go4.org v0.0.0-20191010144846-132d2879e1e9 // indirect
87-
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
88-
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
89-
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
90-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
91-
golang.org/x/text v0.3.6 // indirect
88+
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
89+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
90+
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
91+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
92+
golang.org/x/text v0.3.7 // indirect
9293
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
9394
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
9495
google.golang.org/appengine v1.6.7 // indirect
95-
google.golang.org/protobuf v1.26.0 // indirect
96+
google.golang.org/protobuf v1.27.1 // indirect
9697
gopkg.in/inf.v0 v0.9.1 // indirect
9798
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
9899
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
99-
k8s.io/apiextensions-apiserver v0.22.0-rc.0 // indirect
100-
k8s.io/cli-runtime v0.22.0 // indirect
101-
k8s.io/component-base v0.22.0 // indirect
102-
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
103-
k8s.io/kubectl v0.22.0 // indirect
104-
k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect
105-
sigs.k8s.io/kustomize/api v0.8.11 // indirect
106-
sigs.k8s.io/kustomize/kyaml v0.11.0 // indirect
107-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
100+
k8s.io/apiextensions-apiserver v0.23.0 // indirect
101+
k8s.io/cli-runtime v0.23.0 // indirect
102+
k8s.io/component-base v0.23.0 // indirect
103+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
104+
k8s.io/kubectl v0.23.0 // indirect
105+
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 // indirect
106+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
107+
sigs.k8s.io/kustomize/api v0.10.1 // indirect
108+
sigs.k8s.io/kustomize/kyaml v0.13.0 // indirect
109+
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
108110
)

0 commit comments

Comments
 (0)