Update controllers/nodefeaturediscovery_finalizers.go

Co-authored-by: Markus Lehtonen <markus.lehtonen@intel.com>

controllers/nodefeaturediscovery_finalizers.go

@@ -94,31 +94,14 @@ func (r *NodeFeatureDiscoveryReconciler) hasFinalizer(instance *nfdv1.NodeFeatur
 
 // removeFinalizer removes a finalizer from the operator's instance
 func (r *NodeFeatureDiscoveryReconciler) removeFinalizer(instance *nfdv1.NodeFeatureDiscovery, finalizer string) {
-	// 'finalizers' will contain a list of all the finalizers for
-	// the NFD operator instance, except for the finalizer that
-	// is being removed. (The finalizer to remove is defined with
-	// this function's parameter 'finalizer'.)
 	var finalizers []string
 
-	// The instance will have a list of finalizers under its
-	// `metav1.ObjectMeta` reference
 	for _, f := range instance.Finalizers {
-
-		// If the current finalizer in the list matches the
-		// 'finalizer' parameter, then we want to remove it.
-		// However, rather than delete from the list, it is
-		// more efficient to just create a new list and set
-		// the 'Finalizers' attribute to that new list. Thus,
-		// this part of the loop skips the addition of the
-		// finalizer we want to remove.
-		if f == finalizer {
-			continue
+		if f != finalizer {
+			finalizers = append(finalizers, f)
 		}
-		finalizers = append(finalizers, f)
 	}
-
-	// Update the 'Finalizers' attribute to point to the newly
-	// updated list.
+
 	instance.Finalizers = finalizers
 }