Skip to content

Commit 1459c96

Browse files
committed
Revendor to bring kube 1.18 deps
To generate CRDs with structural schema compliant properties we update sigs.k8s.io/controller-tools This indirectly requires to update pretty much all the k8s and openshift api machinery stack. k8s.io/api v0.18.0-rc.1 k8s.io/apimachinery v0.18.0-rc.1 k8s.io/client-go v0.18.0-rc.1 k8s.io/code-generator v0.18.0-rc.1 k8s.io/klog v1.0.0 k8s.io/kube-aggregator v0.18.0-rc.1 // indirect k8s.io/kubectl v0.18.0-rc.1 github.com/openshift/api v0.0.0-20200323095748-e7041f8762a3 github.com/openshift/client-go v0.0.0-20200320150128-a906f3d8e723 github.com/openshift/library-go v0.0.0-20200324092245-db2a8546af81
1 parent 70d185a commit 1459c96

File tree

2,265 files changed

+230643
-100969
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,265 files changed

+230643
-100969
lines changed

go.mod

Lines changed: 20 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,41 @@
11
module github.com/openshift/machine-api-operator
22

3-
go 1.12
3+
go 1.13
44

55
require (
6-
github.com/beorn7/perks v1.0.1 // indirect
76
github.com/blang/semver v3.5.1+incompatible
87
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
9-
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
10-
github.com/google/go-cmp v0.3.1 // indirect
8+
github.com/golang/groupcache v0.0.0-20191002201903-404acd9df4cc // indirect
119
github.com/google/uuid v1.1.1
1210
github.com/hashicorp/golang-lru v0.5.3 // indirect
1311
github.com/imdario/mergo v0.3.8 // indirect
14-
github.com/openshift/api v0.0.0-20200127192224-ffde1bfabb9f
15-
github.com/openshift/client-go v0.0.0-20190617165122-8892c0adc000
16-
github.com/openshift/cluster-version-operator v3.11.1-0.20190629164025-08cac1c02538+incompatible
12+
github.com/openshift/api v0.0.0-20200323095748-e7041f8762a3
13+
github.com/openshift/client-go v0.0.0-20200320150128-a906f3d8e723
14+
github.com/openshift/library-go v0.0.0-20200324092245-db2a8546af81
1715
github.com/operator-framework/operator-sdk v0.5.1-0.20190301204940-c2efe6f74e7b
1816
github.com/pkg/errors v0.8.1
19-
github.com/prometheus/client_golang v1.0.0
20-
github.com/prometheus/common v0.6.0 // indirect
17+
github.com/prometheus/client_golang v1.1.0
18+
github.com/prometheus/common v0.7.0 // indirect
2119
github.com/prometheus/procfs v0.0.5 // indirect
2220
github.com/spf13/cobra v0.0.5
2321
github.com/stretchr/testify v1.4.0
2422
github.com/vmware/govmomi v0.21.0
25-
go.uber.org/atomic v1.4.0 // indirect
26-
go.uber.org/zap v1.10.0 // indirect
27-
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
28-
golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5 // indirect
29-
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
30-
gonum.org/v1/gonum v0.0.0-20190915125329-975d99cd20a9 // indirect
31-
google.golang.org/appengine v1.6.1 // indirect
32-
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
23+
golang.org/x/net v0.0.0-20200202094626-16171245cfb2
24+
golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 // indirect
25+
google.golang.org/appengine v1.6.4 // indirect
3326
gopkg.in/gcfg.v1 v1.2.3
3427
gopkg.in/warnings.v0 v0.1.2 // indirect
35-
k8s.io/api v0.17.2
36-
k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604 // indirect
37-
k8s.io/apimachinery v0.17.2
38-
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
39-
k8s.io/code-generator v0.17.2
28+
k8s.io/api v0.18.0-rc.1
29+
k8s.io/apimachinery v0.18.0-rc.1
30+
k8s.io/client-go v0.18.0-rc.1
31+
k8s.io/code-generator v0.18.0-rc.1
4032
k8s.io/klog v1.0.0
41-
k8s.io/kube-aggregator v0.0.0-20190404125450-f5e124c822d6 // indirect
42-
k8s.io/kubectl v0.0.0-20200124035537-9f7d91504e51
43-
k8s.io/utils v0.0.0-20191217005138-9e5e9d854fcc
33+
k8s.io/kube-aggregator v0.18.0-rc.1 // indirect
34+
k8s.io/kubectl v0.18.0-rc.1
35+
k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab
4436
sigs.k8s.io/controller-runtime v0.3.1-0.20191016212439-2df793d02076
45-
sigs.k8s.io/controller-tools v0.2.2-0.20190919191502-76a25b63325a
46-
sigs.k8s.io/testing_frameworks v0.1.2-0.20190130140139-57f07443c2d4 // indirect
47-
sigs.k8s.io/yaml v1.1.0
37+
sigs.k8s.io/controller-tools v0.2.8
38+
sigs.k8s.io/yaml v1.2.0
4839
)
4940

50-
replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2
51-
52-
replace sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.2.2-0.20190919191502-76a25b63325a
53-
54-
replace github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
55-
56-
// pinning to kubernetes-1.16.0
57-
58-
replace k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
59-
60-
replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
61-
62-
// Pinning to origin-4.3-kubernetes-1.16.0
63-
64-
replace k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes-apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
65-
66-
replace k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20190913080033-27d36303b655
67-
68-
replace k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20190918160344-1fbdaa4c8d90
69-
70-
replace k8s.io/kube-aggregator => github.com/openshift/kubernetes-kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
41+
replace sigs.k8s.io/controller-runtime => github.com/munnerz/controller-runtime v0.1.8-0.20200318092001-e22ac1073450

go.sum

Lines changed: 217 additions & 79 deletions
Large diffs are not rendered by default.

vendor/github.com/Azure/go-ansiterm/LICENSE

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/go-ansiterm/README.md

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/go-ansiterm/constants.go

Lines changed: 188 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/go-ansiterm/context.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/go-ansiterm/csi_entry_state.go

Lines changed: 49 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)