This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-helm.git
The following commit(s) were added to refs/heads/master by this push:
new 917a6ff Integrate BanyanDB cluster as storage solution (#145)
917a6ff is described below
commit 917a6ff8bb20c2dca843df4317dcd3d9a337dff6
Author: Huang Youliang <[email protected]>
AuthorDate: Wed Mar 27 20:27:49 2024 +0800
Integrate BanyanDB cluster as storage solution (#145)
---
.github/workflows/e2e.ci.yaml | 6 ++++--
chart/skywalking/Chart.yaml | 5 +++--
chart/skywalking/values.yaml | 11 +++++++++++
test/e2e/{e2e-banyandb.yaml => e2e-banyandb-cluster.yaml} | 5 ++++-
test/e2e/{e2e-banyandb.yaml => e2e-banyandb-standalone.yaml} | 3 +++
5 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/e2e.ci.yaml b/.github/workflows/e2e.ci.yaml
index c5eab67..c6f0b4b 100644
--- a/.github/workflows/e2e.ci.yaml
+++ b/.github/workflows/e2e.ci.yaml
@@ -37,8 +37,10 @@ jobs:
test:
- name: Run Skywalking E2E Test (Elasticsearch as database)
config: test/e2e/e2e-elasticsearch.yaml
- - name: Run Skywalking E2E Test (BanyanDB as database)
- config: test/e2e/e2e-banyandb.yaml
+ - name: Run Skywalking E2E Test (standalone BanyanDB as database)
+ config: test/e2e/e2e-banyandb-standalone.yaml
+ - name: Run Skywalking E2E Test (BanyanDB cluster as database)
+ config: test/e2e/e2e-banyandb-cluster.yaml
- name: Run SWCK E2E Test
config: test/e2e/swck/e2e.yaml
name: ${{ matrix.test.name }}
diff --git a/chart/skywalking/Chart.yaml b/chart/skywalking/Chart.yaml
index b236d8d..4f4b244 100644
--- a/chart/skywalking/Chart.yaml
+++ b/chart/skywalking/Chart.yaml
@@ -39,6 +39,7 @@ dependencies:
repository:
https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
condition: postgresql.enabled
- name: skywalking-banyandb-helm
- version: 0.1.0
- repository: oci://registry-1.docker.io/apache
+ alias: banyandb
+ version: 0.0.0-8bdff75
+ repository: oci://ghcr.io/apache/skywalking-banyandb-helm
condition: banyandb.enabled
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 90c84a1..8e2d426 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -456,6 +456,17 @@ banyandb:
httpHost: banyandb-http
httpPort: 17913
targets: "banyandb-grpc:17912"
+ standalone:
+ enabled: true
+ cluster:
+ enabled: false
+ liaison:
+ replicas: 1
+ data:
+ replicas: 1
+ etcd:
+ enabled: false
+ replicaCount: 1
satellite:
name: satellite
diff --git a/test/e2e/e2e-banyandb.yaml b/test/e2e/e2e-banyandb-cluster.yaml
similarity index 98%
copy from test/e2e/e2e-banyandb.yaml
copy to test/e2e/e2e-banyandb-cluster.yaml
index c879b8a..d45c879 100644
--- a/test/e2e/e2e-banyandb.yaml
+++ b/test/e2e/e2e-banyandb-cluster.yaml
@@ -43,7 +43,7 @@ setup:
- name: Install SkyWalking
command: |
helm dep up chart/skywalking
- helm -n istio-system install skywalking chart/skywalking \
+ helm -n istio-system install --timeout 10m skywalking chart/skywalking
\
--set fullnameOverride=skywalking \
--set
oap.env.SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS=k8s-mesh \
--set oap.env.SW_ENVOY_METRIC_ALS_TCP_ANALYSIS=k8s-mesh
\
@@ -56,6 +56,9 @@ setup:
--set oap.storageType=banyandb \
--set elasticsearch.enabled=false \
--set banyandb.enabled=true \
+ --set banyandb.standalone.enabled=false \
+ --set banyandb.cluster.enabled=true \
+ --set banyandb.etcd.enabled=true \
--set satellite.enabled=true \
--set satellite.image.repository=$SATELLITE_REPO \
--set satellite.image.tag=$SATELLITE_TAG \
diff --git a/test/e2e/e2e-banyandb.yaml b/test/e2e/e2e-banyandb-standalone.yaml
similarity index 98%
rename from test/e2e/e2e-banyandb.yaml
rename to test/e2e/e2e-banyandb-standalone.yaml
index c879b8a..8308518 100644
--- a/test/e2e/e2e-banyandb.yaml
+++ b/test/e2e/e2e-banyandb-standalone.yaml
@@ -56,6 +56,9 @@ setup:
--set oap.storageType=banyandb \
--set elasticsearch.enabled=false \
--set banyandb.enabled=true \
+ --set banyandb.standalone.enabled=true \
+ --set banyandb.cluster.enabled=false \
+ --set banyandb.etcd.enabled=false \
--set satellite.enabled=true \
--set satellite.image.repository=$SATELLITE_REPO \
--set satellite.image.tag=$SATELLITE_TAG \
