Skip to content

Commit ebfd135

Browse files
Use metav1.Object instead of Object
In order to allow for a broader adoption of ContainsFinalizer, RemoveFinalizer and AddFinalizer and remove a BC break introduced to 0.5.x I switched the method back to the `metav1.Object`. After reading #959 and #962 I'm unable to understand the benefit of requiring `runtime.Object` so I propose to revert the BC break and possible panic on line 285.
1 parent cea989b commit ebfd135

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pkg/controller/controllerutil/controllerutil.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ func mutate(f MutateFn, key client.ObjectKey, obj runtime.Object) error {
238238
type MutateFn func() error
239239

240240
// AddFinalizer accepts an Object and adds the provided finalizer if not present.
241-
func AddFinalizer(o Object, finalizer string) {
241+
func AddFinalizer(o metav1.Object, finalizer string) {
242242
f := o.GetFinalizers()
243243
for _, e := range f {
244244
if e == finalizer {
@@ -257,12 +257,12 @@ func AddFinalizerWithError(o runtime.Object, finalizer string) error {
257257
if err != nil {
258258
return err
259259
}
260-
AddFinalizer(m.(Object), finalizer)
260+
AddFinalizer(m, finalizer)
261261
return nil
262262
}
263263

264264
// RemoveFinalizer accepts an Object and removes the provided finalizer if present.
265-
func RemoveFinalizer(o Object, finalizer string) {
265+
func RemoveFinalizer(o metav1.Object, finalizer string) {
266266
f := o.GetFinalizers()
267267
for i := 0; i < len(f); i++ {
268268
if f[i] == finalizer {
@@ -282,12 +282,12 @@ func RemoveFinalizerWithError(o runtime.Object, finalizer string) error {
282282
if err != nil {
283283
return err
284284
}
285-
RemoveFinalizer(m.(Object), finalizer)
285+
RemoveFinalizer(m, finalizer)
286286
return nil
287287
}
288288

289289
// ContainsFinalizer checks an Object that the provided finalizer is present.
290-
func ContainsFinalizer(o Object, finalizer string) bool {
290+
func ContainsFinalizer(o metav1.Object, finalizer string) bool {
291291
f := o.GetFinalizers()
292292
for _, e := range f {
293293
if e == finalizer {

0 commit comments

Comments
 (0)