Skip to content

Commit 9190537

Browse files
authored
Merge pull request #3329 from tbavelier/main
🌱 [noop] Modernize finalizer utils
2 parents 6a59ec0 + f80753f commit 9190537

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

pkg/controller/controllerutil/controllerutil.go

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121
"fmt"
2222
"reflect"
23+
"slices"
2324

2425
"k8s.io/apimachinery/pkg/api/equality"
2526
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -501,10 +502,8 @@ type MutateFn func() error
501502
// It returns an indication of whether it updated the object's list of finalizers.
502503
func AddFinalizer(o client.Object, finalizer string) (finalizersUpdated bool) {
503504
f := o.GetFinalizers()
504-
for _, e := range f {
505-
if e == finalizer {
506-
return false
507-
}
505+
if slices.Contains(f, finalizer) {
506+
return false
508507
}
509508
o.SetFinalizers(append(f, finalizer))
510509
return true
@@ -517,7 +516,7 @@ func RemoveFinalizer(o client.Object, finalizer string) (finalizersUpdated bool)
517516
length := len(f)
518517

519518
index := 0
520-
for i := 0; i < length; i++ {
519+
for i := range length {
521520
if f[i] == finalizer {
522521
continue
523522
}
@@ -531,10 +530,5 @@ func RemoveFinalizer(o client.Object, finalizer string) (finalizersUpdated bool)
531530
// ContainsFinalizer checks an Object that the provided finalizer is present.
532531
func ContainsFinalizer(o client.Object, finalizer string) bool {
533532
f := o.GetFinalizers()
534-
for _, e := range f {
535-
if e == finalizer {
536-
return true
537-
}
538-
}
539-
return false
533+
return slices.Contains(f, finalizer)
540534
}

0 commit comments

Comments
 (0)