Skip to content

Commit a34e16b

Browse files
stuggiolliewalsh
authored andcommitted
Fix merging ServiceAccount annotations
Related: https://issues.redhat.com/browse/OSPRH-8379 Signed-off-by: Martin Schuppert <[email protected]>
1 parent 6c8da3c commit a34e16b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

modules/common/serviceaccount/serviceaccount.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (s *ServiceAccount) CreateOrPatch(
5656

5757
op, err := controllerutil.CreateOrPatch(ctx, h.GetClient(), sa, func() error {
5858
sa.Labels = util.MergeStringMaps(sa.Labels, s.serviceAccount.Labels)
59-
sa.Annotations = util.MergeStringMaps(sa.Labels, s.serviceAccount.Annotations)
59+
sa.Annotations = util.MergeStringMaps(sa.Annotations, s.serviceAccount.Annotations)
6060

6161
err := controllerutil.SetControllerReference(h.GetBeforeObject(), sa, h.GetScheme())
6262
if err != nil {

0 commit comments

Comments
 (0)