This is an automated email from the ASF dual-hosted git repository.
wankai pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
The following commit(s) were added to refs/heads/main by this push:
new 73d1461 Support BanyanDB new Trace model (#213)
73d1461 is described below
commit 73d1461ec8cc46f6c67af51054c0560e06c7efa3
Author: Wan Kai <[email protected]>
AuthorDate: Tue Oct 28 14:46:45 2025 +0800
Support BanyanDB new Trace model (#213)
---
Makefile.in | 6 +++---
deploy/platform/kubernetes/Chart.yaml | 4 ++--
deploy/platform/kubernetes/Makefile | 9 +++++----
deploy/platform/kubernetes/values.yaml | 17 ++++++++++++-----
4 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 055f230..98cb94c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,17 +26,17 @@ HUB ?= ghcr.io/apache/skywalking-showcase
TAG ?= $(shell git rev-parse --short HEAD)
BANYANDB_IMAGE ?= ghcr.io/apache/skywalking-banyandb
-BANYANDB_IMAGE_TAG ?= f23caf08871b963bbb07b44141457660ff487568
+BANYANDB_IMAGE_TAG ?= 6155fa0242f76dd902957de767ec602b44a0e4c2
STORAGE_CLASS ?= ""
ES_IMAGE ?= docker.elastic.co/elasticsearch/elasticsearch-oss
ES_IMAGE_TAG ?= 7.10.2
SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap
-SW_OAP_IMAGE_TAG ?= 61e84e53f30272c64faff36387b05583a3709954
+SW_OAP_IMAGE_TAG ?= e696349a7d7a2057c498f1bf24a3497ce8211be0
SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= 61e84e53f30272c64faff36387b05583a3709954
+SW_UI_IMAGE_TAG ?= e696349a7d7a2057c498f1bf24a3497ce8211be0
SW_CLI_IMAGE ?=
ghcr.io/apache/skywalking-cli/skywalking-cli:bce7faaabbd57ed1f40156af8a8eb6c3eccea4ae
SW_EVENT_EXPORTER_IMAGE ?=
ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
diff --git a/deploy/platform/kubernetes/Chart.yaml
b/deploy/platform/kubernetes/Chart.yaml
index 057fdf0..52c5419 100644
--- a/deploy/platform/kubernetes/Chart.yaml
+++ b/deploy/platform/kubernetes/Chart.yaml
@@ -24,13 +24,13 @@ sources:
dependencies:
- name: skywalking-helm
alias: skywalking
- version: 0.0.0-133cfc420dd7c278445d714490898eb5cd5a90f0
+ version: 0.0.0-fbe7dfe5659c77925cc7ed40a3d348f90812132b
repository: oci://ghcr.io/apache/skywalking-helm
# @feature: java-agent-injector; the java agent injector is a component of
the swck operator, so we need to deploy the swck operator firstly
- name: skywalking-helm-swck-operator
alias: swck
- version: 0.0.0-133cfc420dd7c278445d714490898eb5cd5a90f0
+ version: 0.0.0-fbe7dfe5659c77925cc7ed40a3d348f90812132b
repository: oci://ghcr.io/apache/skywalking-helm
condition: features.javaAgentInjector.enabled
diff --git a/deploy/platform/kubernetes/Makefile
b/deploy/platform/kubernetes/Makefile
index 2e87215..e4d58e9 100644
--- a/deploy/platform/kubernetes/Makefile
+++ b/deploy/platform/kubernetes/Makefile
@@ -34,12 +34,13 @@ else
PVC_STORAGE_CLASS_FIELD := ,"storageClass":"$(STORAGE_CLASS_SANITIZED)"
HELM_OPTIONS := $(HELM_OPTIONS) --set
skywalking.banyandb.etcd.persistence.storageClass=$(STORAGE_CLASS_SANITIZED)
endif
-HELM_OPTIONS := $(HELM_OPTIONS) --set-json
'skywalking.banyandb.storage.liaison.persistentVolumeClaims[0]={"mountTargets":["measure","stream"],"claimName":"liaison-data","size":"10Gi","accessModes":["ReadWriteOnce"]$(PVC_STORAGE_CLASS_FIELD),"volumeMode":"Filesystem"}'
+HELM_OPTIONS := $(HELM_OPTIONS) --set-json
'skywalking.banyandb.storage.liaison.persistentVolumeClaims[0]={"mountTargets":["measure","stream","trace"],"claimName":"liaison-data","size":"10Gi","accessModes":["ReadWriteOnce"]$(PVC_STORAGE_CLASS_FIELD),"volumeMode":"Filesystem"}'
HELM_OPTIONS := $(HELM_OPTIONS) --set-json
'skywalking.banyandb.storage.data.persistentVolumeClaims[0]={"mountTargets":["stream"],"nodeRole":"hot","claimName":"hot-stream-data","size":"10Gi","accessModes":["ReadWriteOnce"]$(PVC_STORAGE_CLASS_FIELD),"volumeMode":"Filesystem"}'
HELM_OPTIONS := $(HELM_OPTIONS) --set-json
'skywalking.banyandb.storage.data.persistentVolumeClaims[1]={"mountTargets":["measure"],"nodeRole":"hot","claimName":"hot-measure-data","size":"10Gi","accessModes":["ReadWriteOnce"]$(PVC_STORAGE_CLASS_FIELD),"volumeMode":"Filesystem"}'
-HELM_OPTIONS := $(HELM_OPTIONS) --set-json
'skywalking.banyandb.storage.data.persistentVolumeClaims[2]={"mountTargets":["property"],"nodeRole":"hot","claimName":"hot-property-data","size":"2Gi","accessModes":["ReadWriteOnce"]$(PVC_STORAGE_CLASS_FIELD),"volumeMode":"Filesystem"}'
-HELM_OPTIONS := $(HELM_OPTIONS) --set-json
'skywalking.banyandb.storage.data.persistentVolumeClaims[3]={"mountTargets":["stream","measure","property"],"nodeRole":"warm","claimName":"warm-data","size":"50Gi","accessModes":["ReadWriteOnce"]$(PVC_STORAGE_CLASS_FIELD),"volumeMode":"Filesystem"}'
-HELM_OPTIONS := $(HELM_OPTIONS) --set-json
'skywalking.banyandb.storage.data.persistentVolumeClaims[4]={"mountTargets":["stream","measure","property"],"nodeRole":"cold","claimName":"cold-data","size":"100Gi","accessModes":["ReadWriteOnce"]$(PVC_STORAGE_CLASS_FIELD),"volumeMode":"Filesystem"}'
+HELM_OPTIONS := $(HELM_OPTIONS) --set-json
'skywalking.banyandb.storage.data.persistentVolumeClaims[2]={"mountTargets":["property"],"nodeRole":"hot","claimName":"hot-property-data","size":"5Gi","accessModes":["ReadWriteOnce"]$(PVC_STORAGE_CLASS_FIELD),"volumeMode":"Filesystem"}'
+HELM_OPTIONS := $(HELM_OPTIONS) --set-json
'skywalking.banyandb.storage.data.persistentVolumeClaims[3]={"mountTargets":["trace"],"nodeRole":"hot","claimName":"hot-trace-data","size":"50Gi","accessModes":["ReadWriteOnce"]$(PVC_STORAGE_CLASS_FIELD),"volumeMode":"Filesystem"}'
+HELM_OPTIONS := $(HELM_OPTIONS) --set-json
'skywalking.banyandb.storage.data.persistentVolumeClaims[4]={"mountTargets":["stream","measure","property","trace"],"nodeRole":"warm","claimName":"warm-data","size":"100Gi","accessModes":["ReadWriteOnce"]$(PVC_STORAGE_CLASS_FIELD),"volumeMode":"Filesystem"}'
+HELM_OPTIONS := $(HELM_OPTIONS) --set-json
'skywalking.banyandb.storage.data.persistentVolumeClaims[5]={"mountTargets":["stream","measure","property","trace"],"nodeRole":"cold","claimName":"cold-data","size":"500Gi","accessModes":["ReadWriteOnce"]$(PVC_STORAGE_CLASS_FIELD),"volumeMode":"Filesystem"}'
HELM_OPTIONS := $(HELM_OPTIONS) --set
skywalking.oap.image.repository=$(SW_OAP_IMAGE) --set
skywalking.oap.image.tag=$(SW_OAP_IMAGE_TAG)
HELM_OPTIONS := $(HELM_OPTIONS) --set
skywalking.ui.image.repository=$(SW_UI_IMAGE) --set
skywalking.ui.image.tag=$(SW_UI_IMAGE_TAG)
HELM_OPTIONS := $(HELM_OPTIONS) --set
skywalking.ui.env.SW_ZIPKIN_ADDRESS=http://$(RELEASE)-oap.$(NAMESPACE).svc:9412
diff --git a/deploy/platform/kubernetes/values.yaml
b/deploy/platform/kubernetes/values.yaml
index 8c73163..8e6a5c5 100644
--- a/deploy/platform/kubernetes/values.yaml
+++ b/deploy/platform/kubernetes/values.yaml
@@ -59,8 +59,6 @@ skywalking:
SW_CORE_ENABLE_ENDPOINT_NAME_GROUPING_BY_OPENAPI: "false"
SW_CORE_MAX_HTTP_URIS_NUMBER_PER_SVR: "3000"
SW_AI_PIPELINE_URI_RECOGNITION_SERVER_PORT: "17128"
- # 85% for test recovery, remove it after the test
- SW_CORE_MAX_HEAP_MEMORY_USAGE_PERCENT: 85
SW_STORAGE_BANYANDB_RECORDS_TTL_DAYS: "1"
SW_STORAGE_BANYANDB_RECORDS_ENABLE_WARM_STAGE: "true"
SW_STORAGE_BANYANDB_RECORDS_ENABLE_COLD_STAGE: "true"
@@ -257,7 +255,7 @@ skywalking:
liaison:
enabled: true
persistentVolumeClaims:
- - mountTargets: [ "measure", "stream" ]
+ - mountTargets: [ "measure", "stream", "trace" ]
claimName: liaison-data
size: 10Gi
accessModes:
@@ -291,14 +289,23 @@ skywalking:
- ReadWriteOnce
storageClass: ~
volumeMode: Filesystem
- - mountTargets: [ "measure", "stream", "property" ]
+ - mountTargets: [ "trace" ]
+ nodeRole: hot
+ existingClaimName: ~
+ claimName: hot-trace-data
+ size: 50Gi
+ accessModes:
+ - ReadWriteOnce
+ storageClass: ~
+ volumeMode: Filesystem
+ - mountTargets: [ "measure", "stream", "property", "trace" ]
nodeRole: warm
claimName: warm-data
size: 100Gi
accessModes:
- ReadWriteOnce
storageClass: ~
- - mountTargets: [ "measure", "stream", "property" ]
+ - mountTargets: [ "measure", "stream", "property", "trace" ]
nodeRole: cold
claimName: cold-data
size: 500Gi
