Skip to content

Commit

Permalink
Merge pull request #151 from elmiko/mao-update-a132ec00
Browse files Browse the repository at this point in the history
Bug 1954177: Update mao dependency for webhook v1 changes
  • Loading branch information
openshift-merge-robot committed May 18, 2021
2 parents ee948aa + 1ad5b05 commit a60d493
Show file tree
Hide file tree
Showing 1,824 changed files with 253,540 additions and 26,818 deletions.
18 changes: 9 additions & 9 deletions go.mod
Expand Up @@ -4,22 +4,22 @@ go 1.15

require (
github.com/metal3-io/baremetal-operator v0.0.0-00010101000000-000000000000
github.com/openshift/machine-api-operator v0.2.1-0.20210104142355-8e6ae0acdfcf
github.com/openshift/machine-api-operator v0.2.1-0.20210513225032-5644b5803418
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.6.1
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
k8s.io/api v0.20.1
k8s.io/apimachinery v0.20.1
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
k8s.io/api v0.21.0
k8s.io/apimachinery v0.21.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/klog/v2 v2.4.0
sigs.k8s.io/controller-runtime v0.7.0
k8s.io/klog/v2 v2.8.0
sigs.k8s.io/controller-runtime v0.9.0-beta.1.0.20210512131817-ce2f0c92d77e
sigs.k8s.io/controller-tools v0.4.1
sigs.k8s.io/yaml v1.2.0
)

replace (
github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20210415160309-ce5311abf12c // Use OpenShift fork
k8s.io/client-go => k8s.io/client-go v0.20.0
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20201125052318-b85a18cbf338
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20201130182513-88b90230f2a4
k8s.io/client-go => k8s.io/client-go v0.21.0
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20210514001231-4c66f3d38d89
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210513121131-b024905873bb
)
319 changes: 242 additions & 77 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/github.com/MakeNowJust/heredoc/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 6 additions & 7 deletions vendor/github.com/MakeNowJust/heredoc/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/MakeNowJust/heredoc/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions vendor/github.com/MakeNowJust/heredoc/heredoc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a60d493

Please sign in to comment.