Make tracing.service.type and tracing.service.externalPort work (#17205)

Fix #17204 The service type and port should be used by tracing service yaml
istio · Sep 23, 2019 · 9e0887f · 9e0887f
1 parent 18c24b5
commit 9e0887f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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 }}