From 0989bfee95239b0b8a863fdf9386c29bca9dfce9 Mon Sep 17 00:00:00 2001 From: caiweidong Date: Mon, 3 Jun 2019 20:22:38 +0800 Subject: [PATCH] merge common funcs --- pkg/controller/garbagecollector/graph_builder.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/controller/garbagecollector/graph_builder.go b/pkg/controller/garbagecollector/graph_builder.go index 8d39767ccd6..aa0d1d05cc1 100644 --- a/pkg/controller/garbagecollector/graph_builder.go +++ b/pkg/controller/garbagecollector/graph_builder.go @@ -449,19 +449,17 @@ func beingDeleted(accessor metav1.Object) bool { } func hasDeleteDependentsFinalizer(accessor metav1.Object) bool { - finalizers := accessor.GetFinalizers() - for _, finalizer := range finalizers { - if finalizer == metav1.FinalizerDeleteDependents { - return true - } - } - return false + return hasFinalizer(accessor, metav1.FinalizerDeleteDependents) } func hasOrphanFinalizer(accessor metav1.Object) bool { + return hasFinalizer(accessor, metav1.FinalizerOrphanDependents) +} + +func hasFinalizer(accessor metav1.Object, matchingFinalizer string) bool { finalizers := accessor.GetFinalizers() for _, finalizer := range finalizers { - if finalizer == metav1.FinalizerOrphanDependents { + if finalizer == matchingFinalizer { return true } }