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 1994480: Update dependencies to K8s 1.22 #158

Merged
merged 2 commits into from Aug 23, 2021
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
  •  
  •  
  •  
23 changes: 11 additions & 12 deletions go.mod
@@ -1,27 +1,26 @@
module github.com/openshift/cluster-api-provider-baremetal

go 1.15
go 1.16

require (
github.com/metal3-io/baremetal-operator v0.0.0-00010101000000-000000000000
github.com/metal3-io/baremetal-operator/apis v0.0.0
github.com/openshift/machine-api-operator v0.2.1-0.20210513225032-5644b5803418
github.com/openshift/machine-api-operator v0.2.1-0.20210820103535-d50698c302f5
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.7.0
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
k8s.io/api v0.21.1
k8s.io/apimachinery v0.21.1
k8s.io/client-go v12.0.0+incompatible
k8s.io/klog/v2 v2.8.0
sigs.k8s.io/controller-runtime v0.9.0
sigs.k8s.io/controller-tools v0.4.1
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
k8s.io/api v0.22.0
k8s.io/apimachinery v0.22.0
k8s.io/client-go v0.22.0
k8s.io/klog/v2 v2.9.0
sigs.k8s.io/controller-runtime v0.9.6
sigs.k8s.io/controller-tools v0.6.2
sigs.k8s.io/yaml v1.2.0
)

replace (
github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20210716171745-c9a3f2638544 // Use OpenShift fork
github.com/metal3-io/baremetal-operator/apis => github.com/openshift/baremetal-operator/apis v0.0.0-20210716171745-c9a3f2638544 // Use OpenShift fork
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
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20210622023641-c69a3acaee27
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210816141152-a7c40345b994
)
382 changes: 299 additions & 83 deletions go.sum

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions hack/fetch_ext_bins.sh
Expand Up @@ -110,4 +110,10 @@ function setup_envs {
export TEST_ASSET_KUBECTL=/tmp/kubebuilder/bin/kubectl
export TEST_ASSET_KUBE_APISERVER=/tmp/kubebuilder/bin/kube-apiserver
export TEST_ASSET_ETCD=/tmp/kubebuilder/bin/etcd

# Ensure that some home var is set and that it's not the root
export HOME=${HOME:=/tmp/kubebuilder-testing}
if [ $HOME == "/" ]; then
export HOME=/tmp/kubebuilder-testing
fi
}
5 changes: 5 additions & 0 deletions vendor/github.com/Azure/go-ansiterm/go.mod

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

2 changes: 2 additions & 0 deletions vendor/github.com/Azure/go-ansiterm/go.sum

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

24 changes: 19 additions & 5 deletions vendor/github.com/Azure/go-ansiterm/winterm/ansi.go

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

30 changes: 13 additions & 17 deletions vendor/github.com/fatih/color/README.md

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

25 changes: 20 additions & 5 deletions vendor/github.com/fatih/color/color.go

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

2 changes: 2 additions & 0 deletions vendor/github.com/fatih/color/doc.go

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

4 changes: 2 additions & 2 deletions vendor/github.com/fatih/color/go.mod

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

15 changes: 7 additions & 8 deletions vendor/github.com/fatih/color/go.sum

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

4 changes: 2 additions & 2 deletions vendor/github.com/go-openapi/jsonpointer/.travis.yml

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

60 changes: 30 additions & 30 deletions vendor/github.com/go-openapi/jsonpointer/pointer.go

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

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