Skip to content

Commit 26c2a62

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #1459 from msherif1234/kube_update_1.24
Bug 2090437: Bump CNO to k8s 1.24
2 parents 90e879f + f58b1a9 commit 26c2a62

File tree

1,181 files changed

+38154
-44475
lines changed

Some content is hidden

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

1,181 files changed

+38154
-44475
lines changed

‎go.mod

+49-54
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,44 @@ require (
1010
github.com/go-bindata/go-bindata v3.1.2+incompatible
1111
github.com/gophercloud/gophercloud v0.19.0
1212
github.com/gophercloud/utils v0.0.0-20210720165645-8a3ad2ad9e70
13-
github.com/onsi/gomega v1.17.0
14-
github.com/openshift/api v0.0.0-20220322000322-9c4998a4d646
13+
github.com/onsi/gomega v1.18.1
14+
github.com/openshift/api v0.0.0-20220525145417-ee5b62754c68
1515
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3
16-
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3
17-
github.com/openshift/hypershift v0.0.0-20220323152148-c356b8b72d66
18-
github.com/openshift/library-go v0.0.0-20211220195323-eca2c467c492
16+
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
17+
github.com/openshift/library-go v0.0.0-20220525173854-9b950a41acdc
1918
github.com/pkg/errors v0.9.1
20-
github.com/prometheus/client_golang v1.11.0
21-
github.com/spf13/cobra v1.2.1
19+
github.com/prometheus/client_golang v1.12.1
20+
github.com/spf13/cobra v1.4.0
2221
github.com/spf13/pflag v1.0.5
2322
github.com/stretchr/testify v1.7.0
2423
github.com/vishvananda/netlink v1.1.0
25-
golang.org/x/net v0.0.0-20211209124913-491a49abca63
24+
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
25+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
2626
gopkg.in/yaml.v2 v2.4.0
27-
k8s.io/api v0.23.3
28-
k8s.io/apiextensions-apiserver v0.23.0
29-
k8s.io/apimachinery v0.23.3
30-
k8s.io/client-go v0.23.3
31-
k8s.io/code-generator v0.23.0
32-
k8s.io/component-base v0.23.3
33-
k8s.io/klog/v2 v2.30.0
34-
k8s.io/kube-proxy v0.22.1
35-
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
36-
sigs.k8s.io/cluster-api-provider-openstack v0.0.0-a384cbe0dfa0c2543f6d35f024431a12494e670a
37-
sigs.k8s.io/controller-runtime v0.11.0
27+
k8s.io/api v0.24.0
28+
k8s.io/apiextensions-apiserver v0.24.0
29+
k8s.io/apimachinery v0.24.0
30+
k8s.io/client-go v0.24.0
31+
k8s.io/code-generator v0.24.0
32+
k8s.io/component-base v0.24.0
33+
k8s.io/klog/v2 v2.60.1
34+
k8s.io/kube-proxy v0.24.0
35+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
36+
sigs.k8s.io/cluster-api-provider-openstack v0.3.3
37+
sigs.k8s.io/controller-runtime v0.12.0
3838
)
3939

4040
require (
4141
cloud.google.com/go v0.93.3 // indirect
4242
github.com/BurntSushi/toml v0.4.1 // indirect
43-
github.com/Masterminds/goutils v1.1.0 // indirect
43+
github.com/Masterminds/goutils v1.1.1 // indirect
4444
github.com/NYTimes/gziphandler v1.1.1 // indirect
4545
github.com/PuerkitoBio/purell v1.1.1 // indirect
4646
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
4747
github.com/beorn7/perks v1.0.1 // indirect
4848
github.com/blang/semver v3.5.1+incompatible // indirect
49-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
49+
github.com/blang/semver/v4 v4.0.0 // indirect
50+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
5051
github.com/coreos/go-semver v0.3.0 // indirect
5152
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
5253
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -57,42 +58,40 @@ require (
5758
github.com/go-logr/logr v1.2.2 // indirect
5859
github.com/go-openapi/jsonpointer v0.19.5 // indirect
5960
github.com/go-openapi/jsonreference v0.19.6 // indirect
60-
github.com/go-openapi/swag v0.19.15 // indirect
61+
github.com/go-openapi/swag v0.21.1 // indirect
6162
github.com/gogo/protobuf v1.3.2 // indirect
6263
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6364
github.com/golang/protobuf v1.5.2 // indirect
65+
github.com/google/gnostic v0.5.7-v3refs // indirect
6466
github.com/google/go-cmp v0.5.6 // indirect
6567
github.com/google/gofuzz v1.2.0 // indirect
6668
github.com/google/uuid v1.3.0 // indirect
67-
github.com/googleapis/gnostic v0.5.5 // indirect
6869
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
6970
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
7071
github.com/huandu/xstrings v1.3.2 // indirect
7172
github.com/imdario/mergo v0.3.12 // indirect
7273
github.com/inconshreveable/mousetrap v1.0.0 // indirect
7374
github.com/josharian/intern v1.0.0 // indirect
7475
github.com/json-iterator/go v1.1.12 // indirect
75-
github.com/mailru/easyjson v0.7.6 // indirect
76+
github.com/mailru/easyjson v0.7.7 // indirect
7677
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
77-
github.com/mitchellh/copystructure v1.0.0 // indirect
78+
github.com/mitchellh/copystructure v1.2.0 // indirect
7879
github.com/mitchellh/go-homedir v1.1.0 // indirect
79-
github.com/mitchellh/reflectwalk v1.0.1 // indirect
80+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
8081
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8182
github.com/modern-go/reflect2 v1.0.2 // indirect
8283
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
83-
github.com/openshift/custom-resource-status v0.0.0-20200602122900-c002fd1547ca // indirect
84-
github.com/pborman/uuid v1.2.0 // indirect
84+
github.com/openshift/hypershift v0.0.0-20220525174911-c7c2b57c98ca
8585
github.com/pkg/profile v1.3.0 // indirect
8686
github.com/pmezard/go-difflib v1.0.0 // indirect
8787
github.com/prometheus/client_model v0.2.0 // indirect
88-
github.com/prometheus/common v0.28.0 // indirect
89-
github.com/prometheus/procfs v0.6.0 // indirect
88+
github.com/prometheus/common v0.32.1 // indirect
89+
github.com/prometheus/procfs v0.7.3 // indirect
9090
github.com/robfig/cron v1.2.0 // indirect
9191
github.com/sirupsen/logrus v1.8.1 // indirect
92-
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
93-
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
94-
go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
95-
go.etcd.io/etcd/client/v3 v3.5.0 // indirect
92+
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
93+
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
94+
go.etcd.io/etcd/client/v3 v3.5.1 // indirect
9695
go.opentelemetry.io/contrib v0.20.0 // indirect
9796
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
9897
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
@@ -107,36 +106,32 @@ require (
107106
go.uber.org/atomic v1.7.0 // indirect
108107
go.uber.org/multierr v1.6.0 // indirect
109108
go.uber.org/zap v1.19.1 // indirect
110-
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
111-
golang.org/x/mod v0.4.2 // indirect
112-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
109+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
110+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
111+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
113112
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
114-
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
115-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
113+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
114+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
116115
golang.org/x/text v0.3.7 // indirect
117-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
118-
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
116+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
117+
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 // indirect
119118
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
120119
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
121120
google.golang.org/appengine v1.6.7 // indirect
122-
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
123-
google.golang.org/grpc v1.40.0 // indirect
121+
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
122+
google.golang.org/grpc v1.42.0 // indirect
124123
google.golang.org/protobuf v1.27.1 // indirect
125124
gopkg.in/inf.v0 v0.9.1 // indirect
126125
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
127126
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
128-
k8s.io/apiserver v0.23.3 // indirect
129-
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
130-
k8s.io/kube-aggregator v0.23.0 // indirect
131-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
132-
kubevirt.io/api v0.0.0-20211117075245-c94ce62baf5a // indirect
133-
kubevirt.io/containerized-data-importer-api v1.41.0 // indirect
134-
kubevirt.io/controller-lifecycle-operator-sdk v0.2.1 // indirect
135-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 // indirect
136-
sigs.k8s.io/cluster-api v1.0.2 // indirect
127+
k8s.io/apiserver v0.24.0 // indirect
128+
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
129+
k8s.io/kube-aggregator v0.24.0 // indirect
130+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
131+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
132+
sigs.k8s.io/cluster-api v1.1.3 // indirect
137133
sigs.k8s.io/cluster-api-provider-aws v1.1.0 // indirect
138-
sigs.k8s.io/cluster-api-provider-ibmcloud v0.2.0-alpha.1 // indirect
139-
sigs.k8s.io/cluster-api-provider-kubevirt v0.0.0-00010101000000-000000000000 // indirect
134+
sigs.k8s.io/cluster-api-provider-ibmcloud v0.2.0 // indirect
140135
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
141136
sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
142137
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect

0 commit comments

Comments
 (0)