From 9e0887f5cef4ef4038f464e113be28d02937c782 Mon Sep 17 00:00:00 2001
From: FengyunPan2 <pan_feng_yun@163.com>
Date: Mon, 23 Sep 2019 18:41:12 +0800
Subject: [PATCH] Make tracing.service.type and tracing.service.externalPort
 work (#17205)

Fix #17204
The service type and port should be used by tracing service yaml
---
 .../helm/istio/charts/tracing/templates/service.yaml      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install/kubernetes/helm/istio/charts/tracing/templates/service.yaml b/install/kubernetes/helm/istio/charts/tracing/templates/service.yaml
index fe94067b0a6c..8d8e8612178c 100644
--- a/install/kubernetes/helm/istio/charts/tracing/templates/service.yaml
+++ b/install/kubernetes/helm/istio/charts/tracing/templates/service.yaml
@@ -20,10 +20,9 @@ items:
       heritage: {{ .Release.Service }}
       release: {{ .Release.Name }}
   spec:
-    type: {{ .Values.service.type }}
     ports:
       - port: {{ .Values.service.externalPort }}
-        targetPort: 9411
+        targetPort: {{ .Values.zipkin.queryPort }}
         protocol: TCP
         name: {{ .Values.service.name }}
     selector:
@@ -43,14 +42,15 @@ items:
       heritage: {{ .Release.Service }}
       release: {{ .Release.Name }}
   spec:
+    type: {{ .Values.service.type }}
     ports:
       - name: http-query
-        port: 80
+        port: {{ .Values.service.externalPort }}
         protocol: TCP
 {{ if eq .Values.provider "jaeger" }}
         targetPort: 16686
 {{ else }}
-        targetPort: 9411
+        targetPort: {{ .Values.zipkin.queryPort }}
 {{ end}}
     selector:
       app: {{ .Values.provider }}