Skip to content

Commit c9d8781

Browse files
labeller: add a field manager
Signed-off-by: Steve Kuznetsov <[email protected]>
1 parent 7e8d77c commit c9d8781

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pkg/controller/operators/labeller/labels.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func ObjectLabeler[T metav1.Object, A ApplyConfig[A]](
8484
install.OLMManagedLabelKey: install.OLMManagedLabelValue,
8585
})
8686

87-
_, err := apply(cast.GetNamespace(), ctx, cfg, metav1.ApplyOptions{})
87+
_, err := apply(cast.GetNamespace(), ctx, cfg, metav1.ApplyOptions{FieldManager: "olm"})
8888
return err
8989
}
9090
}
@@ -166,7 +166,7 @@ func ObjectPatchLabeler(
166166
return fmt.Errorf("failed to create patch for %s/%s: %w", cast.GetNamespace(), cast.GetName(), err)
167167
}
168168

169-
_, err = patch(ctx, cast.GetName(), types.MergePatchType, patchBytes, metav1.PatchOptions{})
169+
_, err = patch(ctx, cast.GetName(), types.MergePatchType, patchBytes, metav1.PatchOptions{FieldManager: "olm"})
170170
return err
171171
}
172172
}

pkg/controller/operators/labeller/rbac.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func ContentHashLabeler[T metav1.Object, A ApplyConfig[A]](
6868
cfg.WithLabels(map[string]string{
6969
resolver.ContentHashLabelKey: hash,
7070
})
71-
_, err = apply(cast.GetNamespace(), ctx, cfg, metav1.ApplyOptions{})
71+
_, err = apply(cast.GetNamespace(), ctx, cfg, metav1.ApplyOptions{FieldManager: "olm"})
7272
return err
7373
}
7474
}

0 commit comments

Comments
 (0)