Adding support for zipkin UI

apache · Jul 24, 2023 · 6b39624 · 6b39624
1 parent a21482a
commit 6b39624
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/chart/skywalking/README.md b/chart/skywalking/README.md
@@ -53,6 +53,7 @@ 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.zipkinui`                            | OAP http port for Zipkin UI                                                                                                                                                                                                                                                                                                   | disabled                                                                                                                 |
 | `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`                                                                                                         |
@@ -87,6 +88,7 @@ The following table lists the configurable parameters of the Skywalking chart an
 | `ui.service.annotations`                    | Kubernetes service annotations                                                                                                                                                                                                                                                                                             | `{}`                                                                                                                    |
 | `ui.service.loadBalancerSourceRanges`       | Limit load balancer source IPs to list of CIDRs (where available))                                                                                                                                                                                                                                                         | `[]`                                                                                                                    |
 | `ui.securityContext`                        | Allows you to set the [securityContext](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) for the pod                                                                                                                                                         | `fsGroup: 1000`<br>`runAsUser: 1000`                                                                                    |
+| `ui.zipkin.enabled`                    | Enable the zipkin UI                                                                                                                                                                                                                                                                                             | `false`                         |
 | `oapInit.nodeAffinity`                      | OAP init job node affinity policy                                                                                                                                                                                                                                                                                          | `{}`                                                                                                                    |
 | `oapInit.nodeSelector`                      | OAP init job labels for master pod assignment                                                                                                                                                                                                                                                                              | `{}`                                                                                                                    |
 | `oapInit.tolerations`                       | OAP init job tolerations                                                                                                                                                                                                                                                                                                   | `[]`                                                                                                                    |

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 and .Values.ui.zipkin.enabled .Values.oap.ports.zipkinui }}
+        - name: SW_ZIPKIN_ADDRESS
+          value: "http://{{ template "skywalking.oap.fullname" . }}:{{ .Values.oap.ports.zipkinui }}"
+{{- end }}
         {{- range $key, $value :=  .Values.ui.env }}
         - name: {{ $key }}
           value: {{ $value | quote }}

diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
@@ -170,6 +170,8 @@ ui:
     # runAsUser: 1000
     # runAsGroup: 1000
     # fsGroup: 1000
+  zipkin:
+    enabled: false
   env:
 
 oapInit: