This is an automated email from the ASF dual-hosted git repository. innerpeacez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git
The following commit(s) were added to refs/heads/master by this push: new 73f5788 Adding support for zipkin UI (#127) 73f5788 is described below commit 73f5788997b0c5d54eb87317255e3e29bf9e1058 Author: ChrisFisher <55266940+yangfish...@users.noreply.github.com> AuthorDate: Tue Jul 25 21:38:01 2023 +0800 Adding support for zipkin UI (#127) --- chart/skywalking/README.md | 2 ++ chart/skywalking/templates/oap-deployment.yaml | 12 ++++++++++++ chart/skywalking/templates/ui-deployment.yaml | 4 ++++ chart/skywalking/values.yaml | 2 ++ 4 files changed, 20 insertions(+) diff --git a/chart/skywalking/README.md b/chart/skywalking/README.md index 757ccf8..ea9675e 100644 --- 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.zipkinreceiver` | OAP http port for Zipkin receiver(not exposed by default) | `9411` [...] +| `oap.ports.zipkinquery` | 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 index c19d442..b061ca2 100644 --- 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 .Values.oap.ports.zipkinreceiver }} + - name: SW_RECEIVER_ZIPKIN + value: default + - name: SW_RECEIVER_ZIPKIN_REST_PORT + value: "{{ .Values.oap.ports.zipkinreceiver }}" +{{- end }} +{{- if .Values.oap.ports.zipkinquery }} + - name: SW_QUERY_ZIPKIN + value: default + - name: SW_QUERY_ZIPKIN_REST_PORT + value: "{{ .Values.oap.ports.zipkinquery }}" +{{- 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 index 6495d23..4945f3c 100644 --- 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 .Values.oap.ports.zipkinquery }} + - name: SW_ZIPKIN_ADDRESS + value: "http://{{ template "skywalking.oap.fullname" . }}:{{ .Values.oap.ports.zipkinquery }}" +{{- end }} {{- range $key, $value := .Values.ui.env }} - name: {{ $key }} value: {{ $value | quote }} diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml index e0bc6e4..5c95a11 100644 --- a/chart/skywalking/values.yaml +++ b/chart/skywalking/values.yaml @@ -41,6 +41,8 @@ oap: # zabbix: 10051 grpc: 11800 rest: 12800 + # zipkinreceiver: 9411 + # zipkinquery: 9412 replicas: 2 service: type: ClusterIP