Skip to content

Bump kube 1.16.0 #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 4, 2019
Merged

Bump kube 1.16.0 #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6786001
Revendor for kube-1.16.0
enxebre Sep 30, 2019
87f81c2
Update gen-crd to work with latest code-generator
enxebre Sep 30, 2019
cae6cf8
Rename variables and struct to satisfy kube-1.16.0
enxebre Oct 3, 2019
8ef7321
Re generate clients
enxebre Oct 3, 2019
af29b4b
Regenerate CRDs
enxebre Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
57 changes: 35 additions & 22 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,47 +3,60 @@ module github.com/openshift/machine-api-operator
go 1.12

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

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

replace k8s.io/apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed => github.com/openshift/kubernetes-apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed
replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2

replace k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1 => github.com/openshift/kubernetes-apimachinery v0.0.0-20190313205120-d7deff9243b1
replace sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.2.2-0.20190919191502-76a25b63325a

replace k8s.io/client-go v11.0.0+incompatible => github.com/openshift/kubernetes-client-go v11.0.0+incompatible
replace github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b

replace k8s.io/kube-aggregator v0.0.0-20190314000639-da8327669ac5 => github.com/openshift/kubernetes-kube-aggregator v0.0.0-20190314000639-da8327669ac5
// pinning to kubernetes-1.16.0

replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2
replace k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f

replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269

// Pinning to origin-4.3-kubernetes-1.16.0

replace k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes-apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783

replace k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20190913080033-27d36303b655

replace k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20190918160344-1fbdaa4c8d90

replace k8s.io/kube-aggregator => github.com/openshift/kubernetes-kube-aggregator v0.0.0-20190918161219-8c8f079fddc3

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