fix: properly handle shutdown signal for admin dashboard #23231
Merged
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
This PR should enable the clean shutdown of the admin dashboard instead of needing to `kill -9` it. Fixes argoproj#22758. Signed-off-by: Blake Pettersson <[email protected]>
❌ Preview Environment deleted from BunnyshellAvailable commands (reply to this comment):
|
14 tasks
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## master #23231 +/- ##
==========================================
+ Coverage 59.98% 60.06% +0.07%
==========================================
Files 343 341 -2
Lines 57890 57879 -11
==========================================
+ Hits 34727 34763 +36
+ Misses 20381 20342 -39
+ Partials 2782 2774 -8 ☔ View full report in Codecov by Sentry. |
crenshaw-dev
reviewed
Jun 3, 2025
Signed-off-by: Blake Pettersson <[email protected]>
Signed-off-by: Blake Pettersson <[email protected]>
Signed-off-by: Blake Pettersson <[email protected]>
crenshaw-dev
reviewed
Jun 4, 2025
| fmt.Printf("Argo CD UI is available at http://%s:%d\n", config.Address, config.Port) | ||
| <-ctx.Done() | ||
| println("signal received, shutting down dashboard") | ||
| cancel() |
There was a problem hiding this comment.
Maybe unnecessary? We already have a defer cancel. And I think we can only hit this line if the context is "done" anyway.
There was a problem hiding this comment.
That's what I was initially thinking as well, but according to the docs of signal.NotifyContext stop() should be called as soon as the context is done, which unregisters the signal handlers.
* add assertion in test * rename `cancel()` to `stop()` to align with notifycontext conventions Signed-off-by: Blake Pettersson <[email protected]>
Signed-off-by: Blake Pettersson <[email protected]>
Signed-off-by: Blake Pettersson <[email protected]>
dsuhinin
pushed a commit
to dsuhinin/argo-cd
that referenced
this pull request
Jun 16, 2025
) Signed-off-by: Blake Pettersson <[email protected]> Signed-off-by: dsuhinin <[email protected]>
enneitex
pushed a commit
to enneitex/argo-cd
that referenced
this pull request
Aug 24, 2025
) Signed-off-by: Blake Pettersson <[email protected]> Signed-off-by: enneitex <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR should enable the clean shutdown of the admin dashboard instead of needing to
kill -9it. Fixes #22758.Checklist: