Merge pull request #37 from hasheddan/ismanagedkind

claim predicates: remove hasdirectclassreferencekind in favor of ismanagedkind
crossplane-contrib · Sep 27, 2019 · a83c882 · a83c882
2 parents 8738e60 + 19ff25f
commit a83c882
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/controller/gcp/cache/claim.go b/pkg/controller/gcp/cache/claim.go
@@ -46,7 +46,7 @@ func (c *CloudMemorystoreInstanceClaimController) SetupWithManager(mgr ctrl.Mana
 
 	p := resource.NewPredicates(resource.AnyOf(
 		resource.HasManagedResourceReferenceKind(resource.ManagedKind(v1alpha2.CloudMemorystoreInstanceGroupVersionKind)),
-		resource.HasDirectClassReferenceKind(resource.NonPortableClassKind(v1alpha2.CloudMemorystoreInstanceClassGroupVersionKind)),
+		resource.IsManagedKind(resource.ManagedKind(v1alpha2.CloudMemorystoreInstanceGroupVersionKind), mgr.GetScheme()),
 		resource.HasIndirectClassReferenceKind(mgr.GetClient(), mgr.GetScheme(), resource.ClassKinds{
 			Portable:    cachev1alpha1.RedisClusterClassGroupVersionKind,
 			NonPortable: v1alpha2.CloudMemorystoreInstanceClassGroupVersionKind,

diff --git a/pkg/controller/gcp/compute/claim.go b/pkg/controller/gcp/compute/claim.go
@@ -46,7 +46,7 @@ func (c *GKEClusterClaimController) SetupWithManager(mgr ctrl.Manager) error {
 
 	p := resource.NewPredicates(resource.AnyOf(
 		resource.HasManagedResourceReferenceKind(resource.ManagedKind(v1alpha2.GKEClusterGroupVersionKind)),
-		resource.HasDirectClassReferenceKind(resource.NonPortableClassKind(v1alpha2.GKEClusterClassGroupVersionKind)),
+		resource.IsManagedKind(resource.ManagedKind(v1alpha2.GKEClusterGroupVersionKind), mgr.GetScheme()),
 		resource.HasIndirectClassReferenceKind(mgr.GetClient(), mgr.GetScheme(), resource.ClassKinds{
 			Portable:    computev1alpha1.KubernetesClusterClassGroupVersionKind,
 			NonPortable: v1alpha2.GKEClusterClassGroupVersionKind,

diff --git a/pkg/controller/gcp/database/claim.go b/pkg/controller/gcp/database/claim.go
@@ -46,7 +46,7 @@ func (c *PostgreSQLInstanceClaimController) SetupWithManager(mgr ctrl.Manager) e
 
 	p := resource.NewPredicates(resource.AnyOf(
 		resource.HasManagedResourceReferenceKind(resource.ManagedKind(v1alpha2.CloudsqlInstanceGroupVersionKind)),
-		resource.HasDirectClassReferenceKind(resource.NonPortableClassKind(v1alpha2.CloudsqlInstanceClassGroupVersionKind)),
+		resource.IsManagedKind(resource.ManagedKind(v1alpha2.CloudsqlInstanceGroupVersionKind), mgr.GetScheme()),
 		resource.HasIndirectClassReferenceKind(mgr.GetClient(), mgr.GetScheme(), resource.ClassKinds{
 			Portable:    databasev1alpha1.PostgreSQLInstanceClassGroupVersionKind,
 			NonPortable: v1alpha2.CloudsqlInstanceClassGroupVersionKind,
@@ -129,7 +129,7 @@ func (c *MySQLInstanceClaimController) SetupWithManager(mgr ctrl.Manager) error
 
 	p := resource.NewPredicates(resource.AnyOf(
 		resource.HasManagedResourceReferenceKind(resource.ManagedKind(v1alpha2.CloudsqlInstanceGroupVersionKind)),
-		resource.HasDirectClassReferenceKind(resource.NonPortableClassKind(v1alpha2.CloudsqlInstanceClassGroupVersionKind)),
+		resource.IsManagedKind(resource.ManagedKind(v1alpha2.CloudsqlInstanceGroupVersionKind), mgr.GetScheme()),
 		resource.HasIndirectClassReferenceKind(mgr.GetClient(), mgr.GetScheme(), resource.ClassKinds{
 			Portable:    databasev1alpha1.MySQLInstanceClassGroupVersionKind,
 			NonPortable: v1alpha2.CloudsqlInstanceClassGroupVersionKind,

diff --git a/pkg/controller/gcp/storage/claim.go b/pkg/controller/gcp/storage/claim.go
@@ -46,7 +46,7 @@ func (c *BucketClaimController) SetupWithManager(mgr ctrl.Manager) error {
 
 	p := resource.NewPredicates(resource.AnyOf(
 		resource.HasManagedResourceReferenceKind(resource.ManagedKind(v1alpha2.BucketGroupVersionKind)),
-		resource.HasDirectClassReferenceKind(resource.NonPortableClassKind(v1alpha2.BucketClassGroupVersionKind)),
+		resource.IsManagedKind(resource.ManagedKind(v1alpha2.BucketGroupVersionKind), mgr.GetScheme()),
 		resource.HasIndirectClassReferenceKind(mgr.GetClient(), mgr.GetScheme(), resource.ClassKinds{
 			Portable:    storagev1alpha1.BucketClassGroupVersionKind,
 			NonPortable: v1alpha2.BucketClassGroupVersionKind,