labellers: use unique field managers

It seems like using the same field manager for two distinct fields leads
to the label set oscillating between the two states instead of
converging to the union of both requests.

Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: fcbb7fed9043d2df1061ee33f80aa383a262f24a
Signed-off-by: Steve Kuznetsov <[email protected]>

Author: stevekuznetsov

staging/operator-lifecycle-manager/pkg/controller/operators/labeller/labels.go

@@ -84,7 +84,7 @@ func ObjectLabeler[T metav1.Object, A ApplyConfig[A]](
 				install.OLMManagedLabelKey: install.OLMManagedLabelValue,
 			})
 
-			_, err := apply(cast.GetNamespace(), ctx, cfg, metav1.ApplyOptions{FieldManager: "olm"})
+			_, err := apply(cast.GetNamespace(), ctx, cfg, metav1.ApplyOptions{FieldManager: "olm-ownership-labeller"})
 			return err
 		}
 	}
@@ -166,7 +166,7 @@ func ObjectPatchLabeler(
 				return fmt.Errorf("failed to create patch for %s/%s: %w", cast.GetNamespace(), cast.GetName(), err)
 			}
 
-			_, err = patch(ctx, cast.GetName(), types.MergePatchType, patchBytes, metav1.PatchOptions{FieldManager: "olm"})
+			_, err = patch(ctx, cast.GetName(), types.MergePatchType, patchBytes, metav1.PatchOptions{FieldManager: "olm-ownership-labeller"})
 			return err
 		}
 	}

staging/operator-lifecycle-manager/pkg/controller/operators/labeller/rbac.go

@@ -68,7 +68,7 @@ func ContentHashLabeler[T metav1.Object, A ApplyConfig[A]](
 			cfg.WithLabels(map[string]string{
 				resolver.ContentHashLabelKey: hash,
 			})
-			_, err = apply(cast.GetNamespace(), ctx, cfg, metav1.ApplyOptions{FieldManager: "olm"})
+			_, err = apply(cast.GetNamespace(), ctx, cfg, metav1.ApplyOptions{FieldManager: "olm-hash-labeller"})
 			return err
 		}
 	}