Merge pull request crossplane-contrib#25 from hasheddan/ismanagedkind

claim predicates: remove hasdirectclassreferencekind in favor of ismanagedkind
namku · Sep 27, 2019 · f7cadd6 · f7cadd6
2 parents 4e8d190 + 780baf5
commit f7cadd6
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/aws/cache/claim.go b/pkg/controller/aws/cache/claim.go
@@ -60,7 +60,7 @@ func (c *ReplicationGroupClaimController) SetupWithManager(mgr ctrl.Manager) err
 
 	p := resource.NewPredicates(resource.AnyOf(
 		resource.HasManagedResourceReferenceKind(resource.ManagedKind(v1alpha2.ReplicationGroupGroupVersionKind)),
-		resource.HasDirectClassReferenceKind(resource.NonPortableClassKind(v1alpha2.ReplicationGroupClassGroupVersionKind)),
+		resource.IsManagedKind(resource.ManagedKind(v1alpha2.ReplicationGroupGroupVersionKind), mgr.GetScheme()),
 		resource.HasIndirectClassReferenceKind(mgr.GetClient(), mgr.GetScheme(), resource.ClassKinds{
 			Portable:    cachev1alpha1.RedisClusterClassGroupVersionKind,
 			NonPortable: v1alpha2.ReplicationGroupClassGroupVersionKind,

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

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

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