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

Change query service portname to 'http-query' #909

Merged
merged 1 commit into from
Feb 14, 2020
Merged

Change query service portname to 'http-query' #909

merged 1 commit into from
Feb 14, 2020

Conversation

objectiser
Copy link
Contributor

Resolves #907

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

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

Should we also have a look at collector. The collector ports might have the same issues e.g. zipkin and Jaeger 14268 port.

@objectiser
Copy link
Contributor Author

@pavolloffay Collector (grpc) is already fine, not sure we would want to expose the zipkin port? If that is a requirement it could be addressed as a separate issue.

@objectiser objectiser merged commit bce10b1 into jaegertracing:master Feb 14, 2020
@pavolloffay
Copy link
Member

@pavolloffay Collector (grpc) is already fine, not sure we would want to expose the zipkin port? If that is a requirement it could be addressed as a separate issue.

For instance to collect data from clients which makes sense bc zipkin supports large ecosystem of js-client libraries.

@objectiser
Copy link
Contributor Author

Good point - I'll submit another PR soon.

@andye2004
Copy link
Contributor

andye2004 commented Feb 14, 2020

I had actually just opened a PR to fix this issue but I shall close it off given this PR now exists. I hope no-one takes offence but I thought the following worth mentioning.

I would caution that the current PR doesn't take account of when the port is secured, e.g. 443/https. In my own PR I was calling a function as follows:-

func GetPortNameForQueryService(jaeger *v1.Jaeger) string {
	if jaeger.Spec.Ingress.Security == v1.IngressSecurityOAuthProxy {
		return "https-query"
	}
	return "http-query"
}

I think it would make sense to have something similar added to this PR. A couple of additional asserts in the query_test.go were also added to my own and again probably make sense to be part of this one.

For reference the closed PR is #912

@objectiser
Copy link
Contributor Author

@andye2004 Thanks for following up on this - would you mind rebasing your PR to add this change?

andye2004 added a commit to andye2004/jaeger-operator that referenced this pull request Feb 14, 2020
andye2004 added a commit to andye2004/jaeger-operator that referenced this pull request Feb 14, 2020
Signed-off-by: Andy Elliott <andye@yambay.com>
objectiser pushed a commit that referenced this pull request Feb 14, 2020
* Follow up changes to PR #909

Signed-off-by: Andy Elliott <andye@yambay.com>

* Unexported func, internal only required

Signed-off-by: Andy Elliott <andye@yambay.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.

Upstream connect error or disconnect/reset before headers. reset reason: connection termination
3 participants