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

Update to 1.12 and use new admin ports #425

Merged
merged 1 commit into from
May 22, 2019
Merged

Update to 1.12 and use new admin ports #425

merged 1 commit into from
May 22, 2019

Conversation

objectiser
Copy link
Contributor

Signed-off-by: Gary Brown gary@brownuk.com

Signed-off-by: Gary Brown <gary@brownuk.com>
@codecov
Copy link

codecov bot commented May 22, 2019

Codecov Report

Merging #425 into master will increase coverage by 0.06%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #425      +/-   ##
==========================================
+ Coverage   89.72%   89.79%   +0.06%     
==========================================
  Files          64       64              
  Lines        3096     3115      +19     
==========================================
+ Hits         2778     2797      +19     
  Misses        216      216              
  Partials      102      102
Impacted Files Coverage Δ
pkg/deployment/query.go 100% <100%> (ø) ⬆️
pkg/deployment/all-in-one.go 100% <100%> (ø) ⬆️
pkg/deployment/collector.go 100% <100%> (ø) ⬆️
pkg/deployment/ingester.go 100% <100%> (ø) ⬆️
pkg/deployment/agent.go 100% <100%> (ø) ⬆️

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 799d878...db41a64. Read the comment docs.

@@ -39,10 +40,14 @@ func (a *AllInOne) Get() *appsv1.Deployment {
labels := a.labels()
trueVar := true

args := append(a.jaeger.Spec.AllInOne.Options.ToArgs())

adminPort := util.GetPort("--admin-http-port=", args, 14269)
Copy link
Member

Choose a reason for hiding this comment

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

Could you please explain what does 14269? Is it the dafault?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes it is the default - so it is just checking for the default being overridden by an arg.

@objectiser objectiser merged commit 9c40c48 into jaegertracing:master May 22, 2019
@objectiser objectiser deleted the adminports branch May 22, 2019 12:53
@pavolloffay pavolloffay added the enhancement New feature or request label May 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants