File tree Expand file tree Collapse file tree 4 files changed +57
-34
lines changed Expand file tree Collapse file tree 4 files changed +57
-34
lines changed Original file line number Diff line number Diff line change @@ -68,10 +68,10 @@ spec:
68
68
imagePullPolicy : {{ .Values.tempo.image.pullPolicy }}
69
69
name : query-frontend
70
70
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 }}
75
75
{{- if or .Values.global.extraEnv .Values.queryFrontend.extraEnv }}
76
76
env :
77
77
{{- with .Values.global.extraEnv }}
Original file line number Diff line number Diff line change @@ -16,16 +16,17 @@ spec:
16
16
type : ClusterIP
17
17
clusterIP : None
18
18
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 }}
24
23
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 }}
28
27
{{- end }}
28
+ {{- end }}
29
+ {{- end }}
29
30
- name : grpclb
30
31
port : 9096
31
32
protocol : TCP
@@ -34,12 +35,14 @@ spec:
34
35
appProtocol : {{ .Values.queryFrontend.appProtocol.grpc }}
35
36
{{- end }}
36
37
{{- 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 }}
43
46
{{- end }}
44
47
publishNotReadyAddresses : true
45
48
selector :
Original file line number Diff line number Diff line change @@ -17,23 +17,26 @@ spec:
17
17
ipFamilies : {{ .Values.tempo.service.ipFamilies }}
18
18
ipFamilyPolicy : {{ .Values.tempo.service.ipFamilyPolicy }}
19
19
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 }}
25
24
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 }}
29
28
{{- end }}
29
+ {{- end }}
30
+ {{- end }}
30
31
{{- 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 }}
37
40
{{- end }}
38
41
{{- if .Values.queryFrontend.service.loadBalancerIP }}
39
42
loadBalancerIP : {{ .Values.queryFrontend.service.loadBalancerIP }}
Original file line number Diff line number Diff line change @@ -870,6 +870,17 @@ queryFrontend:
870
870
repository : grafana/tempo-query
871
871
# -- Docker image tag for the tempo-query image. Overrides `tempo.image.tag`
872
872
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
873
884
# -- Resource requests and limits for the query
874
885
resources : {}
875
886
# -- Additional CLI args for tempo-query pods
@@ -948,9 +959,15 @@ queryFrontend:
948
959
repository : null
949
960
# -- Docker image tag for the query-frontend image. Overrides `tempo.image.tag`
950
961
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
951
970
service :
952
- # -- Port of the query-frontend service
953
- port : 16686
954
971
# -- Annotations for queryFrontend service
955
972
annotations : {}
956
973
# -- Labels for queryFrontend service
You can’t perform that action at this time.
0 commit comments