labeller: add a field manager

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
operator-framework · Oct 25, 2023 · c9d8781 · c9d8781
1 parent 7e8d77c
commit c9d8781
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/controller/operators/labeller/labels.go b/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{})
+			_, err := apply(cast.GetNamespace(), ctx, cfg, metav1.ApplyOptions{FieldManager: "olm"})
 			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{})
+			_, err = patch(ctx, cast.GetName(), types.MergePatchType, patchBytes, metav1.PatchOptions{FieldManager: "olm"})
 			return err
 		}
 	}

diff --git a/pkg/controller/operators/labeller/rbac.go b/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{})
+			_, err = apply(cast.GetNamespace(), ctx, cfg, metav1.ApplyOptions{FieldManager: "olm"})
 			return err
 		}
 	}