Drop custom predicateutils.Or function (#6364)

gardener · Jul 21, 2022 · f7ee6a4 · f7ee6a4
1 parent 3b823f2
commit f7ee6a4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 142 deletions.
diff --git a/extensions/pkg/controller/dnsrecord/controller.go b/extensions/pkg/controller/dnsrecord/controller.go
@@ -24,7 +24,6 @@ import (
 	extensionspredicate "github.com/gardener/gardener/extensions/pkg/predicate"
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
 	"github.com/gardener/gardener/pkg/controllerutils/mapper"
-	predicateutils "github.com/gardener/gardener/pkg/controllerutils/predicate"
 )
 
 const (
@@ -60,7 +59,7 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
 		// 'garden' namespace and don't belong to a Shoot. Most other DNSRecord resources are created in regular shoot
 		// namespaces (in such cases we want to check whether the respective Shoot is failed). Consequently, we add both
 		// preconditions and ensure at least one of them applies.
-		predicateutils.Or(
+		predicate.Or(
 			extensionspredicate.IsInGardenNamespacePredicate,
 			extensionspredicate.ShootNotFailedPredicate(),
 		),

diff --git a/pkg/controllerutils/predicate/or.go b/pkg/controllerutils/predicate/or.go
diff --git a/pkg/controllerutils/predicate/or_test.go b/pkg/controllerutils/predicate/or_test.go