fix: added logic to remove custom labels from live objects if removed from argocd spec #1823
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alkakumari016
force-pushed
the
alkumari/rec-labels
branch
from
0614ce5 to
6051879
Compare
alkakumari016
force-pushed
the
alkumari/rec-labels
branch
2 times, most recently
from
8c0ef28 to
689fe12
Compare
…rator labels (argoproj-labs#1737) * GITOPS-6285: reconcile operator owned labels for configMap and ignore non operator labels Signed-off-by: Alka Kumari <alkumari@redhat.com> * GITOPS-6285: added reconcilialtion logic for labels Signed-off-by: Alka Kumari <alkumari@redhat.com> * Removed a typo that resulted in test case failures Signed-off-by: Alka Kumari <alkumari@redhat.com> * GITOPS-6285: error handling for r.Client.Update Signed-off-by: Alka Kumari <alkumari@redhat.com> * GITOPS-6285: use r.Update Signed-off-by: Alka Kumari <alkumari@redhat.com> * GITOPS-6285: changed func name to UpdateMapValues and added test cases Signed-off-by: Alka Kumari <alkumari@redhat.com> * GITOPS-6285: removed addKubernetesData and replaced the references with UpdateMapValues Signed-off-by: Alka Kumari <alkumari@redhat.com> 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 <alkumari@redhat.com> * GITOPS-6285: changed comments Signed-off-by: Alka Kumari <alkumari@redhat.com> --------- Signed-off-by: Alka Kumari <alkumari@redhat.com>
… removed from argocd spec Signed-off-by: Alka Kumari <alkumari@redhat.com>
Signed-off-by: Alka Kumari <alkumari@redhat.com>
Signed-off-by: Alka Kumari <alkumari@redhat.com>
Signed-off-by: Alka Kumari <alkumari@redhat.com>
alkakumari016
force-pushed
the
alkumari/rec-labels
branch
from
689fe12 to
e0c8672
Compare
Signed-off-by: Alka Kumari <alkumari@redhat.com>
Signed-off-by: Alka Kumari <alkumari@redhat.com>
…o ginkgo tests for checking custom labels and annotations Signed-off-by: Alka Kumari <alkumari@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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: