Adding support for zipkin UI

apache · Jul 25, 2023 · dfe30e2 · dfe30e2
1 parent e7b653f
commit dfe30e2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/chart/skywalking/README.md b/chart/skywalking/README.md
@@ -53,6 +53,8 @@ The following table lists the configurable parameters of the Skywalking chart an
 | `oap.image.pullPolicy`                      | OAP container image pull policy                                                                                                                                                                                                                                                                                            | `IfNotPresent`                                                                                                          |
 | `oap.ports.grpc`                            | OAP grpc port for tracing or metric                                                                                                                                                                                                                                                                                        | `11800`                                                                                                                 |
 | `oap.ports.rest`                            | OAP http port for Web UI                                                                                                                                                                                                                                                                                                   | `12800`                                                                                                                 |
+| `oap.ports.zipkin-receiver`                  | OAP http port for Zipkin receiver(not exposed by default)                                                                                                                                                                                                                                                                                                   | `9411`                                                                                                                 |
+| `oap.ports.zipkin-query`                     | OAP http port for querying Zipkin traces and UI(not exposed by default)                                                                                                                                                                                                                                                                                                  | `9412`                                                                                                                 |
 | `oap.replicas`                              | OAP k8s deployment replicas                                                                                                                                                                                                                                                                                                | `2`                                                                                                                     |
 | `oap.service.type`                          | OAP svc type                                                                                                                                                                                                                                                                                                               | `ClusterIP`                                                                                                             |
 | `oap.javaOpts`                              | Parameters to be added to `JAVA_OPTS`environment variable for OAP                                                                                                                                                                                                                                                          | `-Xms2g -Xmx2g`                                                                                                         |

diff --git a/chart/skywalking/templates/oap-deployment.yaml b/chart/skywalking/templates/oap-deployment.yaml
@@ -127,6 +127,18 @@ spec:
 {{ toYaml .Values.oap.resources | indent 10 }}
 {{- end }}
         env:
+{{- if index .Values.oap.ports "zipkin-receiver" }}
+        - name: SW_RECEIVER_ZIPKIN
+          value: default
+        - name: SW_RECEIVER_ZIPKIN_REST_PORT
+          value: "{{ index .Values.oap.ports "zipkin-receiver" }}"
+{{- end }}
+{{- if index .Values.oap.ports "zipkin-query" }}
+        - name: SW_QUERY_ZIPKIN
+          value: default
+        - name: SW_QUERY_ZIPKIN_REST_PORT
+          value: "{{ index .Values.oap.ports "zipkin-query" }}"
+{{- end }}
         - name: JAVA_OPTS
           value: "-Dmode=no-init {{ .Values.oap.javaOpts }}"
         - name: SW_CLUSTER

diff --git a/chart/skywalking/templates/ui-deployment.yaml b/chart/skywalking/templates/ui-deployment.yaml
@@ -77,6 +77,10 @@ spec:
         env:
         - name: SW_OAP_ADDRESS
           value: "http://{{ template "skywalking.oap.fullname" . }}:{{ .Values.oap.ports.rest }}"
+{{- if index .Values.oap.ports "zipkin-query" }}
+        - name: SW_ZIPKIN_ADDRESS
+          value: "http://{{ template "skywalking.oap.fullname" . }}:{{ index .Values.oap.ports "zipkin-query" }}"
+{{- end }}
         {{- range $key, $value :=  .Values.ui.env }}
         - name: {{ $key }}
           value: {{ $value | quote }}

diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
@@ -41,6 +41,8 @@ oap:
     # zabbix: 10051
     grpc: 11800
     rest: 12800
+    # zipkin-receiver: 9411
+    # zipkin-query: 9412
   replicas: 2
   service:
     type: ClusterIP