Fix merge annotation function

[SchSeba]

if the current obj as annotation and the updated doesn't we still want to add the ones from the current object

[github-actions]

Thanks for your PR,
To run vendors CIs, Maintainers can use one of:

• /test-all: To run all tests for all vendors.
• /test-e2e-all: To run all E2E tests for all vendors.
• /test-e2e-nvidia-all: To run all E2E tests for NVIDIA vendor.

To skip the vendors CIs, Maintainers can use one of:

• /skip-all: To skip all tests for all vendors.
• /skip-e2e-all: To skip all E2E tests for all vendors.
• /skip-e2e-nvidia-all: To skip all E2E tests for NVIDIA vendor.
  Best regards.

[coveralls]

Pull Request Test Coverage Report for Build 10939403064

Details

• 2 of 2 (100.0%) changed or added relevant lines in 1 file are covered.
• 3 unchanged lines in 1 file lost coverage.
• Overall coverage decreased (-0.02%) to 45.034%

---

Files with Coverage Reduction	New Missed Lines	%
controllers/drain_controller.go	3	67.42%

Totals
Change from base Build 10935762250:	-0.02%
Covered Lines:	6625
Relevant Lines:	14711

---

💛 - Coveralls

[zeeke]

The gist here is: that operator should never remove a label/annotation from its managed object, right?
I guess this is because annotations and labels may come from the user.

[SchSeba]

Right or from operators.

Where I was able to find this issue is in openshift we have an operator to generate the internal pull secret for every service account

apiVersion: v1
imagePullSecrets:
- name: network-resources-injector-sa-dockercfg-46j2c
kind: ServiceAccount
metadata:
  annotations:
    openshift.io/internal-registry-pull-secret-ref: network-resources-injector-sa-dockercfg-46j2c
creationTimestamp: "2024-09-16T12:15:10Z"
  name: network-resources-injector-sa
  namespace: openshift-sriov-network-operator
  ownerReferences:
  - apiVersion: sriovnetwork.openshift.io/v1
    blockOwnerDeletion: true
    controller: true
    kind: SriovOperatorConfig
    name: default
    uid: 745df61d-68d7-4e97-a399-389bae71b7ba
  resourceVersion: "28652"
  uid: 6fe1b49e-943f-4c95-92aa-5cf0ab322151
secrets:
- name: network-resources-injector-sa-dockercfg-46j2c

without this change everytime we did a reconcile we remove this on and the openshift operator was creating a new imagepullSecret

after a few days this was running the number of secrets was huge

[zeeke]

Thanks for explaining. LGTM!

[ykulazhenkov]

LGTM