Use jaeger for zipkin service (istio#5656)

douglas-reid · rshriram · commit 7efb91dc2466 · 2018-05-17T00:04:12.000-04:00
* Switch from openzipkin to jaeger for zipkin service

* Expose ui port on port 80 for zipkin service
diff --git a/install/kubernetes/helm/istio/charts/zipkin/templates/deployment.yaml b/install/kubernetes/helm/istio/charts/zipkin/templates/deployment.yaml
@@ -23,20 +23,23 @@ spec:
           imagePullPolicy: {{ .Values.global.imagePullPolicy }}
           ports:
             - containerPort: {{ .Values.service.internalPort }}
+            - containerPort: {{ .Values.service.uiPort }}
           env:
           - name: POD_NAMESPACE
             valueFrom:
               fieldRef:
                 apiVersion: v1
                 fieldPath: metadata.namespace
+          - name: COLLECTOR_ZIPKIN_HTTP_PORT
+            value: "{{ .Values.service.internalPort }}"
           livenessProbe:
             httpGet:
               path: /
-              port: {{ .Values.service.internalPort }}
+              port: {{ .Values.service.uiPort }}
           readinessProbe:
             httpGet:
               path: /
-              port: {{ .Values.service.internalPort }}
+              port: {{ .Values.service.uiPort }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
       affinity:
diff --git a/install/kubernetes/helm/istio/charts/zipkin/templates/service.yaml b/install/kubernetes/helm/istio/charts/zipkin/templates/service.yaml
@@ -15,5 +15,9 @@ spec:
       targetPort: {{ .Values.service.internalPort }}
       protocol: TCP
       name: {{ .Values.service.name }}
+    - port: 80
+      name: query-http
+      protocol: TCP
+      targetPort: {{ .Values.service.uiPort }}
   selector:
     app: zipkin
diff --git a/install/kubernetes/helm/istio/values.yaml b/install/kubernetes/helm/istio/values.yaml
@@ -389,13 +389,16 @@ zipkin:
   enabled: false
   replicaCount: 1
   image:
-    repository: docker.io/openzipkin/zipkin
-    tag: 2.7
+    # TODO: switch name to tracing or other fix to reflect jaeger as the
+    #       default tracing option
+    repository: jaegertracing/all-in-one
+    tag: 1.4.1
   service:
     name: http
     type: ClusterIP
     externalPort: 9411
     internalPort: 9411
+    uiPort: 16686
   ingress:
     enabled: false
     # Used to create an Ingress record.
