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.

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

TLS configuration for Admin Server #3679

Merged
merged 1 commit into from
May 20, 2022
Merged

TLS configuration for Admin Server #3679

merged 1 commit into from
May 20, 2022

Conversation

mmorel-35
Copy link
Contributor

Short description of the changes

  • Add tls configuration for Admin server

Signed-off-by: Matthieu MOREL mmorel-35@users.noreply.github.com

@mmorel-35 mmorel-35 requested a review from a team as a code owner May 15, 2022 07:56
@mmorel-35 mmorel-35 requested a review from vprithvi May 15, 2022 07:56
@codecov
Copy link

codecov bot commented May 15, 2022

Codecov Report

Merging #3679 (d324649) into main (d30b292) will decrease coverage by 0.02%.
The diff coverage is 89.65%.

@@            Coverage Diff             @@
##             main    #3679      +/-   ##
==========================================
- Coverage   96.59%   96.57%   -0.02%     
==========================================
  Files         268      268              
  Lines       15717    15742      +25     
==========================================
+ Hits        15182    15203      +21     
- Misses        445      449       +4     
  Partials       90       90              
Impacted Files Coverage Δ
cmd/flags/service.go 0.00% <0.00%> (ø)
cmd/flags/admin.go 87.35% <100.00%> (+4.54%) ⬆️
pkg/config/tlscfg/cert_watcher.go 92.63% <0.00%> (-2.11%) ⬇️
cmd/query/app/static_handler.go 95.80% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d30b292...d324649. Read the comment docs.

cmd/flags/service.go Outdated Show resolved Hide resolved
cmd/flags/admin.go Outdated Show resolved Hide resolved
cmd/flags/admin.go Outdated Show resolved Hide resolved
cmd/flags/admin.go Outdated Show resolved Hide resolved
@@ -138,5 +169,6 @@ func (s *AdminServer) registerPprofHandlers() {

// Close stops the HTTP server
func (s *AdminServer) Close() error {
_ = s.tlsCertWatcherCloser.Close()
Copy link
Member

Choose a reason for hiding this comment

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

nit: you can use multierr here to combine the two errors and return as one

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In collectors, we can read that

watchers actually never return errors from Close

so, I'm not sure what multierr will bring in here ?

Signed-off-by: Matthieu MOREL <mmorel-35@users.noreply.github.com>
@mmorel-35 mmorel-35 requested a review from yurishkuro May 20, 2022 12:31
Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

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

thanks

@yurishkuro yurishkuro merged commit 24d2ccf into jaegertracing:main May 20, 2022
@mmorel-35 mmorel-35 deleted the admin/tls branch May 20, 2022 16:14
albertteoh pushed a commit to albertteoh/jaeger that referenced this pull request Jul 13, 2022
Signed-off-by: Matthieu MOREL <mmorel-35@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
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.

2 participants