Skip to content

Commit ee3d807

Browse files
committed
OCPCLOUD-2010: Re-vendor api and library-go for external platform support
Revendor openshift/api and openshift/library-go in order to support the external platform type. library-go PR: openshift/library-go#1496 API PR: openshift/api#1434
1 parent fe83685 commit ee3d807

417 files changed

Lines changed: 11531 additions & 5938 deletions

File tree

Some content is hidden

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

go.mod

Lines changed: 50 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@ go 1.19
44

55
require (
66
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
7-
github.com/go-logr/logr v1.2.3
7+
github.com/go-logr/logr v1.2.4
88
github.com/golangci/golangci-lint v1.52.2
9-
github.com/onsi/ginkgo/v2 v2.8.0
10-
github.com/onsi/gomega v1.26.0
11-
github.com/openshift/api v0.0.0-20230426193520-54a14470e5dc
12-
github.com/openshift/client-go v0.0.0-20230120202327-72f107311084
9+
github.com/onsi/ginkgo/v2 v2.9.4
10+
github.com/onsi/gomega v1.27.6
11+
github.com/openshift/api v0.0.0-20230503133300-8bbcb7ca7183
12+
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb
1313
github.com/openshift/library-go v0.0.0-20230501171818-442d38f5a55b
1414
github.com/spf13/cobra v1.6.1
1515
github.com/spf13/pflag v1.0.5
1616
github.com/stretchr/testify v1.8.2
1717
gopkg.in/gcfg.v1 v1.2.3
1818
gopkg.in/ini.v1 v1.67.0
1919
gopkg.in/yaml.v2 v2.4.0
20-
k8s.io/api v0.26.1
21-
k8s.io/apiextensions-apiserver v0.26.1
22-
k8s.io/apimachinery v0.26.1
23-
k8s.io/client-go v0.26.1
20+
k8s.io/api v0.27.1
21+
k8s.io/apiextensions-apiserver v0.27.1
22+
k8s.io/apimachinery v0.27.1
23+
k8s.io/client-go v0.27.1
2424
k8s.io/cloud-provider-vsphere v1.25.0
25-
k8s.io/component-base v0.26.1
26-
k8s.io/klog/v2 v2.80.1
27-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
25+
k8s.io/component-base v0.27.1
26+
k8s.io/klog/v2 v2.90.1
27+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
2828
sigs.k8s.io/controller-runtime v0.14.4
2929
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230214070730-08dce9f0bfdc
3030
sigs.k8s.io/controller-tools v0.11.3
@@ -54,7 +54,7 @@ require (
5454
github.com/breml/bidichk v0.2.4 // indirect
5555
github.com/breml/errchkjson v0.3.1 // indirect
5656
github.com/butuzov/ireturn v0.1.1 // indirect
57-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
57+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5858
github.com/charithe/durationcheck v0.0.10 // indirect
5959
github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 // indirect
6060
github.com/curioswitch/go-reassign v0.2.0 // indirect
@@ -74,10 +74,10 @@ require (
7474
github.com/ghodss/yaml v1.0.0 // indirect
7575
github.com/go-critic/go-critic v0.7.0 // indirect
7676
github.com/go-logr/zapr v1.2.3 // indirect
77-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
78-
github.com/go-openapi/jsonreference v0.20.0 // indirect
79-
github.com/go-openapi/swag v0.19.14 // indirect
80-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
77+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
78+
github.com/go-openapi/jsonreference v0.20.1 // indirect
79+
github.com/go-openapi/swag v0.22.3 // indirect
80+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
8181
github.com/go-toolsmith/astcast v1.1.0 // indirect
8282
github.com/go-toolsmith/astcopy v1.1.0 // indirect
8383
github.com/go-toolsmith/astequal v1.1.0 // indirect
@@ -91,7 +91,7 @@ require (
9191
github.com/gofrs/flock v0.8.1 // indirect
9292
github.com/gogo/protobuf v1.3.2 // indirect
9393
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
94-
github.com/golang/protobuf v1.5.2 // indirect
94+
github.com/golang/protobuf v1.5.3 // indirect
9595
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
9696
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
9797
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
@@ -136,14 +136,14 @@ require (
136136
github.com/leonklingele/grouper v1.1.1 // indirect
137137
github.com/lufeee/execinquery v1.2.1 // indirect
138138
github.com/magiconair/properties v1.8.6 // indirect
139-
github.com/mailru/easyjson v0.7.6 // indirect
139+
github.com/mailru/easyjson v0.7.7 // indirect
140140
github.com/maratori/testableexamples v1.0.0 // indirect
141141
github.com/maratori/testpackage v1.1.1 // indirect
142142
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect
143143
github.com/mattn/go-colorable v0.1.13 // indirect
144144
github.com/mattn/go-isatty v0.0.17 // indirect
145145
github.com/mattn/go-runewidth v0.0.9 // indirect
146-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
146+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
147147
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
148148
github.com/mgechev/revive v1.3.1 // indirect
149149
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -163,10 +163,10 @@ require (
163163
github.com/pkg/errors v0.9.1 // indirect
164164
github.com/pmezard/go-difflib v1.0.0 // indirect
165165
github.com/polyfloyd/go-errorlint v1.4.0 // indirect
166-
github.com/prometheus/client_golang v1.14.0 // indirect
167-
github.com/prometheus/client_model v0.3.0 // indirect
168-
github.com/prometheus/common v0.37.0 // indirect
169-
github.com/prometheus/procfs v0.8.0 // indirect
166+
github.com/prometheus/client_golang v1.15.1 // indirect
167+
github.com/prometheus/client_model v0.4.0 // indirect
168+
github.com/prometheus/common v0.42.0 // indirect
169+
github.com/prometheus/procfs v0.9.0 // indirect
170170
github.com/quasilyte/go-ruleguard v0.3.19 // indirect
171171
github.com/quasilyte/gogrep v0.5.0 // indirect
172172
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
@@ -211,30 +211,44 @@ require (
211211
go.uber.org/zap v1.24.0 // indirect
212212
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
213213
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
214-
golang.org/x/mod v0.9.0 // indirect
215-
golang.org/x/net v0.8.0 // indirect
216-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
214+
golang.org/x/mod v0.10.0 // indirect
215+
golang.org/x/net v0.9.0 // indirect
216+
golang.org/x/oauth2 v0.5.0 // indirect
217217
golang.org/x/sync v0.1.0 // indirect
218-
golang.org/x/sys v0.6.0 // indirect
219-
golang.org/x/term v0.6.0 // indirect
220-
golang.org/x/text v0.8.0 // indirect
218+
golang.org/x/sys v0.8.0 // indirect
219+
golang.org/x/term v0.7.0 // indirect
220+
golang.org/x/text v0.9.0 // indirect
221221
golang.org/x/time v0.3.0 // indirect
222-
golang.org/x/tools v0.7.0 // indirect
222+
golang.org/x/tools v0.8.0 // indirect
223223
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
224224
google.golang.org/appengine v1.6.7 // indirect
225-
google.golang.org/protobuf v1.28.1 // indirect
225+
google.golang.org/protobuf v1.30.0 // indirect
226226
gopkg.in/inf.v0 v0.9.1 // indirect
227227
gopkg.in/warnings.v0 v0.1.2 // indirect
228228
gopkg.in/yaml.v3 v3.0.1 // indirect
229229
honnef.co/go/tools v0.4.3 // indirect
230-
k8s.io/apiserver v0.26.1 // indirect
231-
k8s.io/kube-aggregator v0.26.1 // indirect
232-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
230+
k8s.io/apiserver v0.27.1 // indirect
231+
k8s.io/kube-aggregator v0.27.1 // indirect
232+
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
233233
mvdan.cc/gofumpt v0.4.0 // indirect
234234
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
235235
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
236236
mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect
237-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
237+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
238238
sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
239239
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
240240
)
241+
242+
replace github.com/openshift/api => github.com/adriengentil/api v0.0.0-20230517133038-07a67c022d53
243+
244+
replace github.com/openshift/library-go => github.com/adriengentil/library-go v0.0.0-20230515150250-b77fab6c5c3e
245+
246+
replace (
247+
k8s.io/api v0.27.1 => k8s.io/api v0.26.1
248+
k8s.io/apiextensions-apiserver v0.27.1 => k8s.io/apiextensions-apiserver v0.26.1
249+
k8s.io/apimachinery v0.27.1 => k8s.io/apimachinery v0.26.1
250+
k8s.io/cli-runtime v0.27.1 => k8s.io/cli-runtime v0.26.1
251+
k8s.io/client-go v0.27.1 => k8s.io/client-go v0.26.1
252+
k8s.io/kube-aggregator v0.27.1 => k8s.io/kube-aggregator v0.26.1
253+
k8s.io/kubectl v0.27.1 => k8s.io/kubectl v0.26.1
254+
)

0 commit comments

Comments
 (0)