Skip to content

Commit e0cb156

Browse files
authored
Revert "Bump kube 1.16.0"
1 parent 43a4926 commit e0cb156

File tree

1,328 files changed

+304966
-148663
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,328 files changed

+304966
-148663
lines changed

go.mod

Lines changed: 22 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,60 +3,47 @@ module github.com/openshift/machine-api-operator
33
go 1.12
44

55
require (
6+
cloud.google.com/go v0.36.0 // indirect
67
github.com/blang/semver v3.5.1+incompatible
78
github.com/ghodss/yaml v1.0.0
9+
github.com/gobuffalo/envy v1.6.15 // indirect
810
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
9-
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
10-
github.com/imdario/mergo v0.3.7 // indirect
11+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
12+
github.com/markbates/inflect v1.0.4 // indirect
13+
github.com/onsi/ginkgo v1.8.0
14+
github.com/onsi/gomega v1.5.0
1115
github.com/openshift/api v3.9.1-0.20190517100836-d5b34b957e91+incompatible
1216
github.com/openshift/client-go v0.0.0-20190617165122-8892c0adc000
13-
github.com/openshift/cluster-api v0.0.0-20191003080455-24cfb34ea1f9
17+
github.com/openshift/cluster-api v0.0.0-20190805113604-f8de78af80fc
18+
github.com/openshift/cluster-api-actuator-pkg v0.0.0-20190904193718-8250b456dec7
19+
github.com/openshift/cluster-autoscaler-operator v0.0.1-0.20190521201101-62768a6ba480
1420
github.com/openshift/cluster-version-operator v3.11.1-0.20190629164025-08cac1c02538+incompatible
1521
github.com/operator-framework/operator-sdk v0.5.1-0.20190301204940-c2efe6f74e7b
1622
github.com/prometheus/client_golang v1.0.0
17-
github.com/prometheus/common v0.6.0 // indirect
18-
github.com/prometheus/procfs v0.0.3 // indirect
19-
github.com/spf13/cobra v0.0.5
23+
github.com/rogpeppe/go-internal v1.3.0 // indirect
24+
github.com/spf13/cobra v0.0.3
2025
github.com/stretchr/testify v1.3.0
21-
golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 // indirect
22-
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb // indirect
23-
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
2426
gonum.org/v1/gonum v0.0.0-20190915125329-975d99cd20a9 // indirect
25-
google.golang.org/appengine v1.6.1 // indirect
26-
k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
27-
k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
27+
k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
28+
k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
2829
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
29-
k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
30+
k8s.io/code-generator v0.0.0-00010101000000-000000000000
3031
k8s.io/klog v0.4.0
31-
k8s.io/kube-aggregator v0.0.0-20190404125450-f5e124c822d6 // indirect
32-
k8s.io/utils v0.0.0-20190801114015-581e00157fb1
32+
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a
3333
sigs.k8s.io/controller-runtime v0.2.0-beta.2
34-
sigs.k8s.io/controller-tools v0.2.2-0.20190919191502-76a25b63325a
34+
sigs.k8s.io/controller-tools v0.1.10
3535
)
3636

3737
replace gopkg.in/fsnotify.v1 v1.4.7 => github.com/fsnotify/fsnotify v1.4.7
3838

39-
replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2
40-
41-
replace sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.2.2-0.20190919191502-76a25b63325a
42-
43-
replace github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
44-
45-
// pinning to kubernetes-1.16.0
39+
replace k8s.io/apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed => github.com/openshift/kubernetes-apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed
4640

47-
replace k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
41+
replace k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1 => github.com/openshift/kubernetes-apimachinery v0.0.0-20190313205120-d7deff9243b1
4842

49-
replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
43+
replace k8s.io/client-go v11.0.0+incompatible => github.com/openshift/kubernetes-client-go v11.0.0+incompatible
5044

51-
// Pinning to origin-4.3-kubernetes-1.16.0
45+
replace k8s.io/kube-aggregator v0.0.0-20190314000639-da8327669ac5 => github.com/openshift/kubernetes-kube-aggregator v0.0.0-20190314000639-da8327669ac5
5246

53-
replace k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes-apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
54-
55-
replace k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20190913080033-27d36303b655
56-
57-
replace k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20190918160344-1fbdaa4c8d90
58-
59-
replace k8s.io/kube-aggregator => github.com/openshift/kubernetes-kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
47+
replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2
6048

61-
// https://github.com/kubernetes-sigs/controller-runtime/pull/618
62-
replace sigs.k8s.io/controller-runtime => github.com/enxebre/controller-runtime v0.2.0-beta.1.0.20190930160522-58015f7fc885
49+
replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190311093542-50b561225d70

0 commit comments

Comments
 (0)