Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(notifications): Allow notifications controller to notify on all namespaces (cherry-pick 2.8) #15855

Merged
merged 3 commits into from
Oct 26, 2023
Merged

fix(notifications): Allow notifications controller to notify on all namespaces (cherry-pick 2.8) #15855

merged 3 commits into from
Oct 26, 2023

Conversation

crenshaw-dev
Copy link
Member

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.

@mayzhang2000 @crenshaw-dev
fix(notifications): Allow notifications controller to notify on all n…
5d5a8b8 
…amespaces (argoproj#15702)

* Allow notifications controller to notify on all namespaces

This adds functionality to the notifications controller to be notified
of and send notifications for applications in any namespace. The
namespaces to watch are controlled by the same --application-namespaces
and ARGOCD_APPLICATION_NAMESPACES variables as in the application
controller.

Signed-off-by: Nikolas Skoufis <nskoufis@seek.com.au>

* Add SEEK to users.md

Signed-off-by: Nikolas Skoufis <nskoufis@seek.com.au>

* Remove unused fields

Signed-off-by: Nikolas Skoufis <nskoufis@seek.com.au>

* Revert changes to Procfile

Signed-off-by: Nik Skoufis <n.skoufis@gmail.com>

* Fix unit tests

Signed-off-by: Nikolas Skoufis <nskoufis@seek.com.au>

* - add argocd namespaces environment variable to notifications controller

Signed-off-by: Stewart Thomson <sthomson@wynshop.com>

* - add example cluster role rbac

Signed-off-by: Stewart Thomson <sthomson@wynshop.com>

* - only look for projects in the controller's namespace (argocd by default)

Signed-off-by: Stewart Thomson <sthomson@wynshop.com>

* - update base manifest

Signed-off-by: Stewart Thomson <sthomson@wynshop.com>

* - skip app processing in notification controller

Signed-off-by: Stewart Thomson <sthomson@wynshop.com>

* added unit test and updated doc

Signed-off-by: May Zhang <may_zhang@intuit.com>

* added unit test and updated doc

Signed-off-by: May Zhang <may_zhang@intuit.com>

* updated examples/k8s-rbac/argocd-server-applications/kustomization.yaml's resources

Signed-off-by: May Zhang <may_zhang@intuit.com>

---------

Signed-off-by: Nikolas Skoufis <nskoufis@seek.com.au>
Signed-off-by: Nik Skoufis <n.skoufis@gmail.com>
Signed-off-by: Stewart Thomson <sthomson@wynshop.com>
Signed-off-by: May Zhang <may_zhang@intuit.com>
Co-authored-by: Nikolas Skoufis <nskoufis@seek.com.au>
Co-authored-by: Nik Skoufis <n.skoufis@gmail.com>
Co-authored-by: Stewart Thomson <sthomson@wynshop.com>

undo unnecessary manifest changes

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

undo unnecessary manifest changes

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@crenshaw-dev crenshaw-dev force-pushed the notifications-fix-2.8 branch from 8f09cca to 5d5a8b8 Compare October 6, 2023 20:54
@crenshaw-dev crenshaw-dev changed the title fix(notifications): Allow notifications controller to notify on all namespaces (cherry-pick) fix(notifications): Allow notifications controller to notify on all namespaces (cherry-pick 2.8) Oct 6, 2023
@codecov
Copy link

codecov bot commented Oct 6, 2023 •
edited
Loading

Codecov Report

Attention: 13 lines in your changes are missing coverage. Please review.

Comparison is base (ebab8ec) 50.03% compared to head (5d5a8b8) 50.02%.
Report is 2 commits behind head on release-2.8.

❗ Current head 5d5a8b8 differs from pull request most recent head c851d7b. Consider uploading reports for the commit c851d7b to get more accurate results

Additional details and impacted files 
@@               Coverage Diff               @@
##           release-2.8   #15855      +/-   ##
===============================================
- Coverage        50.03%   50.02%   -0.01%     
===============================================
  Files              263      263              
  Lines            45108    45127      +19     
===============================================
+ Hits             22569    22575       +6     
- Misses           20331    20342      +11     
- Partials          2208     2210       +2
Files Coverage Δ
notification_controller/controller/controller.go 60.74% <50.00%> (-4.78%) ⬇️

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

mayzhang2000
mayzhang2000 reviewed Oct 13, 2023
View reviewed changes
...rbac/argocd-server-applications/argocd-notifications-controller-rbac-clusterrolebinding.yaml
subjects:
- kind: ServiceAccount
name: argocd-notifications-controller
namespace: argocd
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing https://github.com/mayzhang2000/argo-cd/blob/4de11d5df50d68a94e47d5322dc55acfb5c481bc/examples/k8s-rbac/argocd-server-applications/kustomization.yaml#L6-L7

mayzhang2000
mayzhang2000 reviewed Oct 13, 2023
View reviewed changes
manifests/ha/base/redis-ha/chart/upstream.yaml Outdated
@@ -1080,7 +1080,13 @@ spec:
args:
- /readonly/haproxy_init.sh
securityContext:
null
allowPrivilegeEscalation: false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure where these are from

@crenshaw-dev
Merge remote-tracking branch 'origin/release-2.8' into notifications-…
f94562f 
…fix-2.8

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@crenshaw-dev
revert unnecessary changes
c851d7b 
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
mayzhang2000
mayzhang2000 approved these changes Oct 25, 2023
View reviewed changes
Copy link
Contributor

@mayzhang2000 mayzhang2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@crenshaw-dev crenshaw-dev merged commit 870965d into argoproj:release-2.8 Oct 26, 2023
10 of 13 checks passed
@crenshaw-dev crenshaw-dev deleted the notifications-fix-2.8 branch October 26, 2023 15:33
tooptoop4
tooptoop4 reviewed Oct 28, 2023
View reviewed changes
notification_controller/controller/controller.go
options.LabelSelector = selector
return resClient.List(context.Background(), options)
appList, err := resClient.List(context.TODO(), options)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is context.TODO() expected?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's equivalent to Background. iirc no functional difference

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tooptoop4 tooptoop4 tooptoop4 left review comments

@mayzhang2000 mayzhang2000 mayzhang2000 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@crenshaw-dev @mayzhang2000 @tooptoop4