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

Remove gRPC host-port from being added to the CR (agent) #1272

Conversation

jpkrohling
Copy link
Contributor

Fixes #1271.

Previously, the upgrade routine for 1.18 was adding the gRPC host-port option to the CR. In fact, the host-port is already being added by the sidecar/daemonset if this options isn't set. The CR should only be set by users, in which case we wouldn't touch it again (not for sidecar/daemonset, not for upgrades).

Signed-off-by: Juraci Paixão Kröhling [email protected]

@jpkrohling
Copy link
Contributor Author

@jkandasa are you able to test this PR? This is the image I published with it: quay.io/jpkroehling/jaeger-operator:pr1272

@jpkrohling
Copy link
Contributor Author

@rubenvp8510, could you review this one?

@codecov
Copy link

codecov bot commented Oct 22, 2020

Codecov Report

Merging #1272 into master will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1272      +/-   ##
==========================================
- Coverage   87.43%   87.42%   -0.02%     
==========================================
  Files          90       90              
  Lines        4933     4929       -4     
==========================================
- Hits         4313     4309       -4     
  Misses        457      457              
  Partials      163      163              
Impacted Files Coverage Δ
pkg/upgrade/v1_18_0.go 100.00% <100.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 8b07b3f...cfe30a3. Read the comment docs.

@rubenvp8510
Copy link
Collaborator

This looks good to me. I think this is the right approach, relies on sidecar/daemonset to inject the proper gRPC arguments.

Copy link
Contributor

@objectiser objectiser left a comment

Choose a reason for hiding this comment

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

Just the codecov to sort out.

@jpkrohling
Copy link
Contributor Author

codecov is freaking out because less lines are being covered. Apparently, it can't understand that those lines were actually removed.

@jpkrohling jpkrohling merged commit 2a0f5a3 into jaegertracing:master Oct 22, 2020
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.

Operand upgrading from 1.17 to 1.18 has wrong gRPC host-port
3 participants