Merge pull request #17 from hasheddan/release-0.1.1

back-port fixes for v0.1.1
crossplane-contrib · Nov 4, 2019 · 6acee49 · 6acee49
2 parents be20cbf + edb8306
commit 6acee49
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.12
 require (
 	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
 	github.com/crossplaneio/crossplane v0.3.1-0.20191023221351-518648b051cd
-	github.com/crossplaneio/crossplane-runtime v0.1.0
+	github.com/crossplaneio/crossplane-runtime v0.2.0
 	github.com/google/go-cmp v0.3.1
 	github.com/onsi/ginkgo v1.10.1 // indirect
 	github.com/onsi/gomega v1.7.0 // indirect

diff --git a/go.sum b/go.sum
@@ -18,10 +18,8 @@ github.com/crossplaneio/crossplane v0.3.1-0.20191023221351-518648b051cd h1:jd68c
 github.com/crossplaneio/crossplane v0.3.1-0.20191023221351-518648b051cd/go.mod h1:r/iuuYYKmZ2cTE5DbIfMDQ9GF6xN2PrNXjnxGJUXTMI=
 github.com/crossplaneio/crossplane-runtime v0.0.0-20191023215652-0f37bea5496e h1:tV86Qa72VNiz9HwNpCg3L4FBzPgRz1RwP1GelQn5Vxs=
 github.com/crossplaneio/crossplane-runtime v0.0.0-20191023215652-0f37bea5496e/go.mod h1:FMlJ6k7pUZdxQrjh0B33D2b79iBac+xcMEHTWiruXao=
-github.com/crossplaneio/crossplane-runtime v0.0.0-20191025043010-78072ef19dc5 h1:D1IRKqprfu59B41KQcYtEGDeRnaqIcfIjn0EOedOgOw=
-github.com/crossplaneio/crossplane-runtime v0.0.0-20191025043010-78072ef19dc5/go.mod h1:FMlJ6k7pUZdxQrjh0B33D2b79iBac+xcMEHTWiruXao=
-github.com/crossplaneio/crossplane-runtime v0.1.0 h1:IoPxURwynfUaqOZ/oQ8aLTQq89ueOckm73nbuVZthow=
-github.com/crossplaneio/crossplane-runtime v0.1.0/go.mod h1:FMlJ6k7pUZdxQrjh0B33D2b79iBac+xcMEHTWiruXao=
+github.com/crossplaneio/crossplane-runtime v0.2.0 h1:Lr4/bqyGy8rNyrYhvJcSE8FY2n2KT7IkLdKU38hGw6Q=
+github.com/crossplaneio/crossplane-runtime v0.2.0/go.mod h1:FMlJ6k7pUZdxQrjh0B33D2b79iBac+xcMEHTWiruXao=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

diff --git a/pkg/controller/database/cockroach/claim.go b/pkg/controller/database/cockroach/claim.go
@@ -106,8 +106,6 @@ func (c *ClaimController) SetupWithManager(mgr ctrl.Manager) error {
 		resource.ClaimKind(databasev1alpha1.PostgreSQLInstanceGroupVersionKind),
 		resource.ClassKind(v1alpha1.CockroachClusterClassGroupVersionKind),
 		resource.ManagedKind(v1alpha1.CockroachClusterGroupVersionKind),
-		resource.WithManagedBinder(resource.NewAPIManagedStatusBinder(mgr.GetClient(), mgr.GetScheme())),
-		resource.WithManagedFinalizer(resource.NewAPIManagedStatusUnbinder(mgr.GetClient())),
 		resource.WithManagedConfigurators(
 			resource.ManagedConfiguratorFn(ConfigureCockroachCluster),
 			resource.NewObjectMetaConfigurator(mgr.GetScheme()),

diff --git a/pkg/controller/database/yugabyte/claim.go b/pkg/controller/database/yugabyte/claim.go
@@ -106,8 +106,6 @@ func (c *ClaimController) SetupWithManager(mgr ctrl.Manager) error {
 		resource.ClaimKind(databasev1alpha1.PostgreSQLInstanceGroupVersionKind),
 		resource.ClassKind(v1alpha1.YugabyteClusterClassGroupVersionKind),
 		resource.ManagedKind(v1alpha1.YugabyteClusterGroupVersionKind),
-		resource.WithManagedBinder(resource.NewAPIManagedStatusBinder(mgr.GetClient(), mgr.GetScheme())),
-		resource.WithManagedFinalizer(resource.NewAPIManagedStatusUnbinder(mgr.GetClient())),
 		resource.WithManagedConfigurators(
 			resource.ManagedConfiguratorFn(ConfigureYugabyteCluster),
 			resource.NewObjectMetaConfigurator(mgr.GetScheme()),