Adding support for zipkin UI

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

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/chart/skywalking/templates/oap-deployment.yaml b/chart/skywalking/templates/oap-deployment.yaml
@@ -122,6 +122,17 @@ spec:
         - containerPort: {{ $value }}
           name: {{ $key }}
         {{- end }}
+
+{{- if eq .Values.oap.env.SW_RECEIVER_ZIPKIN "default" }}
+        - containerPort: 9411
+          name: "zipkin"
+{{- end }}
+
+{{- if eq .Values.oap.env.SW_QUERY_ZIPKIN "default" }}
+        - containerPort: 9412
+          name: "zipkin-ui"
+{{- end }}
+
 {{- if .Values.oap.resources }}
         resources:
 {{ toYaml .Values.oap.resources | indent 10 }}

diff --git a/chart/skywalking/templates/oap-svc.yaml b/chart/skywalking/templates/oap-svc.yaml
@@ -30,6 +30,14 @@ spec:
   - port: {{ $value }}
     name: {{ $key }}
   {{- end }}
+{{- if eq .Values.oap.env.SW_RECEIVER_ZIPKIN "default" }}
+  - port: 9411
+    name: "zipkin"
+{{- end }}
+{{- if eq .Values.oap.env.SW_QUERY_ZIPKIN "default" }}
+  - port: 9412
+    name: "zipkin-ui"
+{{- end }}
   selector:
     app: {{ template "skywalking.name" . }}
     component: "{{ .Values.oap.name }}"

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 eq .Values.oap.env.SW_QUERY_ZIPKIN "default" }}
+        - name: SW_ZIPKIN_ADDRESS
+          value: "http://{{ template "skywalking.oap.fullname" . }}:9412"
+{{- end }}
         {{- range $key, $value :=  .Values.ui.env }}
         - name: {{ $key }}
           value: {{ $value | quote }}