From e651c381abe661e5a38ab1607758aae893b3dbeb Mon Sep 17 00:00:00 2001
From: Wan Kai <wankai123@foxmail.com>
Date: Tue, 14 Nov 2023 22:02:41 +0800
Subject: [PATCH] Update banyandb client connection (#140)

---
 .github/workflows/e2e.ci.yaml           |  4 ++--
 chart/skywalking/templates/_helpers.tpl | 10 ++--------
 chart/skywalking/values.yaml            |  3 +--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/e2e.ci.yaml b/.github/workflows/e2e.ci.yaml
index c23801e..c5eab67 100644
--- a/.github/workflows/e2e.ci.yaml
+++ b/.github/workflows/e2e.ci.yaml
@@ -43,9 +43,9 @@ jobs:
             config: test/e2e/swck/e2e.yaml
     name: ${{ matrix.test.name }}
     env:
-      OAP_TAG: 14fbd975be077082ed6fa604e05479dd9af0d995
+      OAP_TAG: 965dea898986ed2ab1343559fb20d6faed11ada9
       OAP_REPO: ghcr.io/apache/skywalking/oap
-      UI_TAG: 14fbd975be077082ed6fa604e05479dd9af0d995
+      UI_TAG: 965dea898986ed2ab1343559fb20d6faed11ada9
       UI_REPO: ghcr.io/apache/skywalking/ui
       SATELLITE_TAG: v35bfaff6352b4dc351a706772796a1f79b651c14
       SATELLITE_REPO: ghcr.io/apache/skywalking-satellite/skywalking-satellite
diff --git a/chart/skywalking/templates/_helpers.tpl b/chart/skywalking/templates/_helpers.tpl
index ed2513f..87631c1 100644
--- a/chart/skywalking/templates/_helpers.tpl
+++ b/chart/skywalking/templates/_helpers.tpl
@@ -160,13 +160,7 @@ Create the name of the service account to use for the satellite cluster
 - name: SW_DATA_SOURCE_PASSWORD
   value: "{{ .Values.postgresql.auth.password }}"
 {{- else if eq .Values.oap.storageType "banyandb" }}
-{{- $banyandbHost := "banyandb-grpc" -}}
-{{- if not .Values.banyandb.enabled -}}
-{{- $banyandbHost = .Values.banyandb.config.grpcHost -}}
-{{- end }}
-- name: SW_STORAGE_BANYANDB_HOST
-  value: "{{ $banyandbHost }}"
-- name: SW_STORAGE_BANYANDB_PORT
-  value: "{{ .Values.banyandb.config.grpcPort }}"
+- name: SW_STORAGE_BANYANDB_TARGETS
+  value: "{{ .Values.banyandb.config.targets }}"
 {{- end }}
 {{- end -}}
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 5c323eb..a2e2f0a 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -449,10 +449,9 @@ postgresql:
 banyandb:
   enabled: false
   config:
-    grpcHost: banyandb-grpc
     httpHost: banyandb-http
-    grpcPort: 17912
     httpPort: 17913
+    targets: "banyandb-grpc:17912"
 
 satellite:
   name: satellite