Skip to content

Commit

Permalink
Merge pull request #163 from elmiko/bz1948719-update-cr
Browse files Browse the repository at this point in the history
Bug 1948719: update controller-runtime dependency
  • Loading branch information
openshift-merge-robot committed May 13, 2021
2 parents 984c7a0 + 8affa96 commit 34db56e
Show file tree
Hide file tree
Showing 25 changed files with 592 additions and 263 deletions.
4 changes: 1 addition & 3 deletions go.mod
Expand Up @@ -11,13 +11,11 @@ require (
github.com/openshift/machine-api-operator v0.2.1-0.20210504014029-a132ec00f7dd
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
google.golang.org/api v0.33.0

// kube 1.18
k8s.io/api v0.21.0
k8s.io/apimachinery v0.21.0
k8s.io/client-go v0.21.0
k8s.io/klog/v2 v2.8.0
sigs.k8s.io/controller-runtime v0.9.0-alpha.1.0.20210413130450-7ef2da0bc161
sigs.k8s.io/controller-runtime v0.9.0-beta.1.0.20210512131817-ce2f0c92d77e
sigs.k8s.io/controller-tools v0.3.0
sigs.k8s.io/yaml v1.2.0
)
Expand Down
153 changes: 2 additions & 151 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Expand Up @@ -691,7 +691,7 @@ k8s.io/utils/trace
sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsprovider/v1beta1
# sigs.k8s.io/cluster-api-provider-azure v0.0.0-00010101000000-000000000000 => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210408182022-987bc3d6a107
sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1beta1
# sigs.k8s.io/controller-runtime v0.9.0-alpha.1.0.20210413130450-7ef2da0bc161
# sigs.k8s.io/controller-runtime v0.9.0-beta.1.0.20210512131817-ce2f0c92d77e
## explicit
sigs.k8s.io/controller-runtime
sigs.k8s.io/controller-runtime/pkg/builder
Expand Down
17 changes: 14 additions & 3 deletions vendor/sigs.k8s.io/controller-runtime/Makefile

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

52 changes: 51 additions & 1 deletion vendor/sigs.k8s.io/controller-runtime/pkg/cache/cache.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.

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.

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

0 comments on commit 34db56e

Please sign in to comment.