Skip to content

Conversation

@alkakumari016
Copy link
Contributor

Assisted-by: < Cursor/Gemini etc>

What type of PR is this?

/kind bug

What does this PR do / why we need it:
When we remove custom labels from the ArgoCD spec (set them to {}), the new code iterates over an empty map, so it doesn't add any new keys, but it also doesn't remove the existing custom keys that should be cleaned up. This PR fixes this bug.

Fixes #?
GITOPS-7405

How to test changes / Special notes to the reviewer:

@alkakumari016 alkakumari016 force-pushed the alkumari/rec-labels branch 2 times, most recently from 8c0ef28 to 689fe12 Compare September 2, 2025 14:45
alkakumari016 and others added 5 commits September 17, 2025 16:52
…rator labels (argoproj-labs#1737)

* GITOPS-6285: reconcile operator owned labels for configMap and ignore non operator labels

Signed-off-by: Alka Kumari <[email protected]>

* GITOPS-6285: added reconcilialtion logic for labels

Signed-off-by: Alka Kumari <[email protected]>

* Removed a typo that resulted in test case failures

Signed-off-by: Alka Kumari <[email protected]>

* GITOPS-6285: error handling for r.Client.Update

Signed-off-by: Alka Kumari <[email protected]>

* GITOPS-6285: use r.Update

Signed-off-by: Alka Kumari <[email protected]>

* GITOPS-6285: changed func name to UpdateMapValues and added test cases

Signed-off-by: Alka Kumari <[email protected]>

* GITOPS-6285: removed addKubernetesData and replaced the references with UpdateMapValues

Signed-off-by: Alka Kumari <[email protected]>

GITOPS-6285: removed addKubernetesData and replaced the references with UpdateMapValues

* GITOPS-6285: removed labels update logic from applicationset and statefulset

Signed-off-by: Alka Kumari <[email protected]>

* GITOPS-6285: changed comments

Signed-off-by: Alka Kumari <[email protected]>

---------

Signed-off-by: Alka Kumari <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant