feat: Add labels on Application's k8s events (#11381) #18160
Merged
Conversation
This file contains 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
todaywasawesome
requested changes
May 16, 2024
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #18160 +/- ##
==========================================
+ Coverage 45.09% 45.13% +0.04%
==========================================
Files 354 354
Lines 48006 48057 +51
==========================================
+ Hits 21648 21691 +43
- Misses 23544 23550 +6
- Partials 2814 2816 +2 ☔ View full report in Codecov by Sentry. |
|
Thanks for @todaywasawesome & @leoluz for your inputs. I have incorporated your suggestions by introducing two new keys |
svghadi
force-pushed
the
app-event-labels
branch
from
b92fe9a
to
5564f2b
Compare
Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
svghadi
force-pushed
the
app-event-labels
branch
from
5564f2b
to
577eafd
Compare
Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
jannfis
reviewed
Jun 14, 2024
| @@ -939,7 +939,7 @@ func (ctrl *ApplicationController) processAppOperationQueueItem() (processNext b | |||
| Message: err.Error(), | |||
| }) | |||
| message := fmt.Sprintf("Unable to delete application resources: %v", err.Error()) | |||
| ctrl.auditLogger.LogAppEvent(app, argo.EventInfo{Reason: argo.EventReasonStatusRefreshed, Type: v1.EventTypeWarning}, message, "") | |||
| ctrl.logAppEvent(app, argo.EventInfo{Reason: argo.EventReasonStatusRefreshed, Type: v1.EventTypeWarning}, message, context.TODO()) | |||
There was a problem hiding this comment.
Was wondering if we had a better context than the TODO() one here and elsewhere.
jannfis
approved these changes
Jun 14, 2024
todaywasawesome
approved these changes
Jun 17, 2024
ggjulio
pushed a commit
to ggjulio/argo-cd
that referenced
this pull request
Jul 21, 2024
…oj#18160) * Add labels on Application's k8s events Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Fix typo Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Add new cm keys & doc Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Fix typo Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * correct rebase changes Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Fix linting Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> --------- Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
jsolana
pushed a commit
to jsolana/argo-cd
that referenced
this pull request
Jul 24, 2024
…oj#18160) * Add labels on Application's k8s events Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Fix typo Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Add new cm keys & doc Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Fix typo Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * correct rebase changes Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Fix linting Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> --------- Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> Signed-off-by: Javier Solana <javier.solana@cabify.com> Signed-off-by: Javier Solana <javier.solana@cabify.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #11381
This PR implements #11381 enhancement to expose application labels on k8s events generated by Argo CD.
Change:
This PR introduces two new key
resource.includeEventLabelKeys&resource.excludeEventLabelKeysinargocd-cmconfigmap which takes in a comma separated string of label keys.For any events generated for Applications containing the label keys specified in
resource.includeEventLabelKeys, the controller adds the matched label onto the event thus establishing an easy link between the event and the application to filter-out/process later using labels. The specified label keys are matched against the Application and it's AppProject labels. In case of conflict between labels on Application and it's AppProject, the Application label values are prioritised and added to the event.Furthermore, labels specified in
resource.excludeEventLabelKeysare removed from the event labels, if they were included.Sample output:
Checklist: