Skip to content

Commit 1227aff

Browse files
committed
Fixed queryFrontend and tempo-query
Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
1 parent 23443c5 commit 1227aff

File tree

4 files changed

+57
-34
lines changed

4 files changed

+57
-34
lines changed

charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ spec:
6868
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
6969
name: query-frontend
7070
ports:
71-
- containerPort: 3100
72-
name: http-metrics
73-
- containerPort: 9095
74-
name: grpc
71+
{{- range .Values.queryFrontend.ports }}
72+
- name: {{ .name | quote }}
73+
containerPort: {{ .port }}
74+
{{- end }}
7575
{{- if or .Values.global.extraEnv .Values.queryFrontend.extraEnv }}
7676
env:
7777
{{- with .Values.global.extraEnv }}

charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@ spec:
1616
type: ClusterIP
1717
clusterIP: None
1818
ports:
19-
- name: http
20-
port: 3100
21-
targetPort: 3100
22-
- name: grpc
23-
port: 9095
19+
{{- range .Values.queryFrontend.ports }}
20+
{{- if .service }}
21+
- name: {{ .name | quote }}
22+
port: {{ .port }}
2423
protocol: TCP
25-
targetPort: 9095
26-
{{- if .Values.queryFrontend.appProtocol.grpc }}
27-
appProtocol: {{ .Values.queryFrontend.appProtocol.grpc }}
24+
targetPort: {{ .port }}
25+
{{- if and (hasPrefix .name "grpc") ($.Values.queryFrontend.appProtocol.grpc) }}
26+
appProtocol: {{ $.Values.queryFrontend.appProtocol.grpc }}
2827
{{- end }}
28+
{{- end }}
29+
{{- end }}
2930
- name: grpclb
3031
port: 9096
3132
protocol: TCP
@@ -34,12 +35,14 @@ spec:
3435
appProtocol: {{ .Values.queryFrontend.appProtocol.grpc }}
3536
{{- end }}
3637
{{- if .Values.queryFrontend.query.enabled }}
37-
- name: tempo-query-jaeger-ui
38-
port: {{ .Values.queryFrontend.service.port }}
39-
targetPort: {{ .Values.queryFrontend.service.port }}
40-
- name: tempo-query-metrics
41-
port: 16687
42-
targetPort: jaeger-metrics
38+
{{- range .Values.queryFrontend.query.ports }}
39+
{{- if .service }}
40+
- name: {{ .name | quote }}
41+
port: {{ .port }}
42+
protocol: TCP
43+
targetPort: {{ .port }}
44+
{{- end }}
45+
{{- end }}
4346
{{- end }}
4447
publishNotReadyAddresses: true
4548
selector:

charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,26 @@ spec:
1717
ipFamilies: {{ .Values.tempo.service.ipFamilies }}
1818
ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }}
1919
ports:
20-
- name: http-metrics
21-
port: 3100
22-
targetPort: 3100
23-
- name: grpc
24-
port: 9095
20+
{{- range .Values.queryFrontend.ports }}
21+
{{- if .service }}
22+
- name: {{ .name | quote }}
23+
port: {{ .port }}
2524
protocol: TCP
26-
targetPort: 9095
27-
{{- if .Values.queryFrontend.appProtocol.grpc }}
28-
appProtocol: {{ .Values.queryFrontend.appProtocol.grpc }}
25+
targetPort: {{ .port }}
26+
{{- if and (hasPrefix .name "grpc") ($.Values.queryFrontend.appProtocol.grpc) }}
27+
appProtocol: {{ $.Values.queryFrontend.appProtocol.grpc }}
2928
{{- end }}
29+
{{- end }}
30+
{{- end }}
3031
{{- if .Values.queryFrontend.query.enabled }}
31-
- name: tempo-query-jaeger-ui
32-
port: {{ .Values.queryFrontend.service.port }}
33-
targetPort: {{ .Values.queryFrontend.service.port }}
34-
- name: tempo-query-metrics
35-
port: 16687
36-
targetPort: jaeger-metrics
32+
{{- range .Values.queryFrontend.query.ports }}
33+
{{- if .service }}
34+
- name: {{ .name | quote }}
35+
port: {{ .port }}
36+
protocol: TCP
37+
targetPort: {{ .port }}
38+
{{- end }}
39+
{{- end }}
3740
{{- end }}
3841
{{- if .Values.queryFrontend.service.loadBalancerIP }}
3942
loadBalancerIP: {{ .Values.queryFrontend.service.loadBalancerIP }}

charts/tempo-distributed/values.yaml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -870,6 +870,17 @@ queryFrontend:
870870
repository: grafana/tempo-query
871871
# -- Docker image tag for the tempo-query image. Overrides `tempo.image.tag`
872872
tag: null
873+
# -- Query service ports
874+
ports:
875+
- name: tempo-query-metrics
876+
port: 16687
877+
service: true
878+
- name: tempo-query-jaeger-ui
879+
port: 16686
880+
service: true
881+
- name: tempo-query-jaeger-grpc
882+
port: 16685
883+
service: true
873884
# -- Resource requests and limits for the query
874885
resources: {}
875886
# -- Additional CLI args for tempo-query pods
@@ -948,9 +959,15 @@ queryFrontend:
948959
repository: null
949960
# -- Docker image tag for the query-frontend image. Overrides `tempo.image.tag`
950961
tag: null
962+
# -- QueryFrontend service ports
963+
ports:
964+
- name: grpc
965+
port: 9095
966+
service: true
967+
- name: http-metrics
968+
port: 3100
969+
service: true
951970
service:
952-
# -- Port of the query-frontend service
953-
port: 16686
954971
# -- Annotations for queryFrontend service
955972
annotations: {}
956973
# -- Labels for queryFrontend service

0 commit comments

Comments
 (0)