Skip to content
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.

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

Bug 1877743: Update openshift/machine-api-operator and pull in k8s 1.19 #96

Merged
merged 2 commits into from Sep 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 10 additions & 10 deletions go.mod
Expand Up @@ -3,25 +3,25 @@ module github.com/openshift/cluster-api-provider-baremetal
go 1.13

require (
github.com/metal3-io/baremetal-operator v0.0.0
github.com/onsi/gomega v1.9.0
github.com/openshift/machine-api-operator v0.2.1-0.20200721125631-d234cceb5de1
github.com/go-logr/zapr v0.2.0 // indirect
github.com/metal3-io/baremetal-operator v0.0.0-00010101000000-000000000000
github.com/onsi/gomega v1.10.1
github.com/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.4.0
golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5
k8s.io/api v0.18.2
k8s.io/apimachinery v0.18.2
github.com/stretchr/testify v1.5.1
golang.org/x/net v0.0.0-20200707034311-ab3426394381
k8s.io/api v0.19.0
k8s.io/apimachinery v0.19.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/klog v1.0.0
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66 // indirect
sigs.k8s.io/controller-runtime v0.6.0
sigs.k8s.io/controller-runtime v0.6.2
sigs.k8s.io/controller-tools v0.3.0
sigs.k8s.io/yaml v1.2.0
)

replace (
github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20200715132148-0f91f62a41fe // Use OpenShift fork
k8s.io/client-go => k8s.io/client-go v0.18.2
k8s.io/client-go => k8s.io/client-go v0.19.0
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20200520125206-5e266b553d8e
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20200529030741-17d4edc5142f
)
174 changes: 164 additions & 10 deletions go.sum

Large diffs are not rendered by default.