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

Expose the query GRPC port #517

Merged
merged 4 commits into from
Jul 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .chloggen/expose-query-grpc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. operator, github action)
component: operator

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Expose the Jaeger GRPC query port

# One or more tracking issues related to the change
issues: [513]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
12 changes: 12 additions & 0 deletions internal/manifests/queryfrontend/query_frontend.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ import (
const (
grpclbPortName = "grpclb"
jaegerMetricsPortName = "jaeger-metrics"
jaegerGRPCQuery = "jaeger-gprc"
jaegerUIPortName = "jaeger-ui"
portGRPCLBServer = 9096
portJaegerGRPCQuery = 16685
portJaegerUI = 16686
portJaegerMetrics = 16687
)
Expand Down Expand Up @@ -178,6 +180,11 @@ func deployment(params manifestutils.Params) (*v1.Deployment, error) {
"--query.bearer-token-propagation=true",
},
Ports: []corev1.ContainerPort{
{
Name: jaegerGRPCQuery,
ContainerPort: portJaegerGRPCQuery,
Protocol: corev1.ProtocolTCP,
},
{
Name: jaegerUIPortName,
ContainerPort: portJaegerUI,
Expand Down Expand Up @@ -312,6 +319,11 @@ func services(tempo v1alpha1.TempoStack) []*corev1.Service {

if tempo.Spec.Template.QueryFrontend.JaegerQuery.Enabled {
jaegerPorts := []corev1.ServicePort{
{
Name: jaegerGRPCQuery,
Port: portJaegerGRPCQuery,
TargetPort: intstr.FromString(jaegerGRPCQuery),
},
{
Name: jaegerUIPortName,
Port: portJaegerUI,
Expand Down
10 changes: 10 additions & 0 deletions internal/manifests/queryfrontend/query_frontend_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ import (

func getJaegerServicePorts() []corev1.ServicePort {
jaegerServicePorts := []corev1.ServicePort{
{
Name: jaegerGRPCQuery,
Port: portJaegerGRPCQuery,
TargetPort: intstr.FromString(jaegerGRPCQuery),
},
{
Name: jaegerUIPortName,
Port: portJaegerUI,
Expand Down Expand Up @@ -215,6 +220,11 @@ func getExpectedDeployment(withJaeger bool) *v1.Deployment {
"--query.bearer-token-propagation=true",
},
Ports: []corev1.ContainerPort{
{
Name: jaegerGRPCQuery,
ContainerPort: portJaegerGRPCQuery,
Protocol: corev1.ProtocolTCP,
},
{
Name: jaegerUIPortName,
ContainerPort: portJaegerUI,
Expand Down
8 changes: 8 additions & 0 deletions tests/e2e/smoketest-with-jaeger/01-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,10 @@ spec:
port: 9095
protocol: TCP
targetPort: grpc
- name: jaeger-gprc
port: 16685
protocol: TCP
targetPort: jaeger-gprc
- name: jaeger-ui
port: 16686
protocol: TCP
Expand Down Expand Up @@ -326,6 +330,10 @@ spec:
port: 9096
protocol: TCP
targetPort: grpclb
- name: jaeger-gprc
port: 16685
protocol: TCP
targetPort: jaeger-gprc
- name: jaeger-ui
port: 16686
protocol: TCP
Expand Down
Loading