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 f4c5b28 feat: update Banyandb configuration and authentication
settings (#166)
f4c5b28 is described below
commit f4c5b28dbfaad731624280e9f8d8635edea9d54d
Author: Gao Hongtao <[email protected]>
AuthorDate: Fri Sep 12 16:32:00 2025 +0800
feat: update Banyandb configuration and authentication settings (#166)
---
.github/workflows/e2e.ci.yaml | 6 ++---
chart/skywalking/Chart.yaml | 40 ++++++++++++++++-----------------
chart/skywalking/templates/_helpers.tpl | 8 +++++++
chart/skywalking/values.yaml | 35 +++++++++++++++++------------
test/e2e/e2e-banyandb-cluster.yaml | 1 +
test/e2e/e2e-banyandb-standalone.yaml | 1 +
6 files changed, 54 insertions(+), 37 deletions(-)
diff --git a/.github/workflows/e2e.ci.yaml b/.github/workflows/e2e.ci.yaml
index bbfe900..709a4a9 100644
--- a/.github/workflows/e2e.ci.yaml
+++ b/.github/workflows/e2e.ci.yaml
@@ -53,13 +53,13 @@ jobs:
config: test/e2e/swck/oap-ui-agent-satellite.yaml
name: ${{ matrix.test.name }}
env:
- OAP_TAG: bf04afdb2a841c60d5e27f5a9fc62d0879a5600c
+ OAP_TAG: 79860ca5c76a77bbd93e76ce4861b24707dd5ee3
OAP_REPO: ghcr.io/apache/skywalking/oap
- UI_TAG: bf04afdb2a841c60d5e27f5a9fc62d0879a5600c
+ UI_TAG: 79860ca5c76a77bbd93e76ce4861b24707dd5ee3
UI_REPO: ghcr.io/apache/skywalking/ui
SATELLITE_TAG: v35bfaff6352b4dc351a706772796a1f79b651c14
SATELLITE_REPO: ghcr.io/apache/skywalking-satellite/skywalking-satellite
- BANYANDB_TAG: 7e5b2d0404e8ad6d5835eee6fe589a2544d0decb
+ BANYANDB_TAG: 46083529398b73504e9ca929ef367cd1776aef82
BANYANDB_REPO: ghcr.io/apache/skywalking-banyandb
steps:
- uses: actions/checkout@v2
diff --git a/chart/skywalking/Chart.yaml b/chart/skywalking/Chart.yaml
index a4fa7ed..05164f7 100644
--- a/chart/skywalking/Chart.yaml
+++ b/chart/skywalking/Chart.yaml
@@ -20,26 +20,26 @@ version: 4.7.0
description: Helm Chart for Apache SkyWalking
icon:
https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg
sources:
- - https://github.com/apache/skywalking-helm
+- https://github.com/apache/skywalking-helm
maintainers:
- - name: hanahmily
- email: [email protected]
- - name: innerpeacez
- email: [email protected]
- - name: kezhenxu94
- email: [email protected]
+- name: hanahmily
+ email: [email protected]
+- name: innerpeacez
+ email: [email protected]
+- name: kezhenxu94
+ email: [email protected]
dependencies:
- - name: elasticsearch
- version: ~7.17.1
- repository: https://helm.elastic.co/
- condition: elasticsearch.enabled
- - name: postgresql
- version: 12.1.2
- repository:
https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
- condition: postgresql.enabled
- - name: skywalking-banyandb-helm
- alias: banyandb
- version: 0.5.0-rc3
- repository: oci://registry-1.docker.io/apache
- condition: banyandb.enabled
+- name: elasticsearch
+ version: ~7.17.1
+ repository: https://helm.elastic.co/
+ condition: elasticsearch.enabled
+- name: postgresql
+ version: 12.1.2
+ repository:
https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+ condition: postgresql.enabled
+- name: skywalking-banyandb-helm
+ alias: banyandb
+ version: 0.5.0-rc4
+ repository: oci://registry-1.docker.io/apache
+ condition: banyandb.enabled
diff --git a/chart/skywalking/templates/_helpers.tpl
b/chart/skywalking/templates/_helpers.tpl
index 1d9c496..d23a7cf 100644
--- a/chart/skywalking/templates/_helpers.tpl
+++ b/chart/skywalking/templates/_helpers.tpl
@@ -166,6 +166,14 @@ Create the name of the service account to use for the
satellite cluster
{{- end }}
- name: SW_STORAGE_BANYANDB_TARGETS
value: "{{ $targets }}"
+{{- if .Values.banyandb.auth.enabled }}
+{{- if .Values.banyandb.auth.users }}
+- name: SW_STORAGE_BANYANDB_USER
+ value: "{{ (index .Values.banyandb.auth.users 0).username }}"
+- name: SW_STORAGE_BANYANDB_PASSWORD
+ value: "{{ (index .Values.banyandb.auth.users 0).password }}"
+{{- end }}
+{{- end }}
{{- end }}
{{- end -}}
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 5cab321..78c3214 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -83,8 +83,8 @@ oap:
# runAsUser: 1000
# runAsGroup: 1000
# fsGroup: 1000
- env:
- # more env, please refer to
https://hub.docker.com/r/apache/skywalking-oap-server
+ env: # more env, please refer to
https://hub.docker.com/r/apache/skywalking-oap-server
+
# or
https://github.com/apache/skywalking-docker/blob/master/6/6.4/oap/README.md#sw_telemetry
# Allows you to add any config files in /skywalking/config
@@ -126,7 +126,7 @@ oap:
# silence-period: 5
# Response time of service {name} is more than 1000ms in 3 minutes
of last 10 minutes.
- # A list of secrets and their paths to mount inside the pod
+ # A list of secrets and their paths to mount inside the pod
secretMounts: []
# - name: elastic-certificates
# secretName: elastic-certificates
@@ -186,6 +186,7 @@ ui:
# fsGroup: 1000
env:
+
oapInit:
nodeAffinity: {}
nodeSelector: {}
@@ -195,7 +196,8 @@ oapInit:
elasticsearch:
enabled: true
- config: # For users of an existing elasticsearch cluster,takes effect when
`elasticsearch.enabled` is false
+ config:
+ # For users of an existing elasticsearch cluster,takes effect when
`elasticsearch.enabled` is false
port:
http: 9200
host: elasticsearch # es service on kubernetes or host
@@ -279,7 +281,7 @@ elasticsearch:
networkHost: "0.0.0.0"
volumeClaimTemplate:
- accessModes: ["ReadWriteOnce"]
+ accessModes: [ "ReadWriteOnce" ]
resources:
requests:
storage: 30Gi
@@ -302,9 +304,9 @@ elasticsearch:
supplementalGroups:
rule: RunAsAny
volumes:
- - secret
- - configMap
- - persistentVolumeClaim
+ - secret
+ - configMap
+ - persistentVolumeClaim
persistence:
enabled: false
@@ -375,7 +377,7 @@ elasticsearch:
securityContext:
capabilities:
drop:
- - ALL
+ - ALL
# readOnlyRootFilesystem: true
runAsNonRoot: true
runAsUser: 1000
@@ -413,7 +415,7 @@ elasticsearch:
# kubernetes.io/tls-acme: "true"
path: /
hosts:
- - chart-example.local
+ - chart-example.local
tls: []
# - secretName: chart-example-tls
# hosts:
@@ -462,6 +464,11 @@ banyandb:
config:
grpcAddress: "banyandb-grpc:17912"
httpAddress: "banyandb-http:17913"
+ auth:
+ enabled: false
+ users:
+ - username: "admin"
+ password: "banyandb"
standalone:
enabled: true
cluster:
@@ -500,10 +507,10 @@ satellite:
# requests:
# cpu: 4
# memory: 4Gi
- podAnnotations:
- # example: oap-foo
- env:
- # more env, please refer to
https://skywalking.apache.org/docs/skywalking-satellite/latest/en/setup/readme/#satellite_configyaml
+ podAnnotations: # example: oap-foo
+
+ env: # more env, please refer to
https://skywalking.apache.org/docs/skywalking-satellite/latest/en/setup/readme/#satellite_configyaml
+
# Allows you to add any config files in /skywalking/config.
config: {}
# satellite_config.yaml: |
diff --git a/test/e2e/e2e-banyandb-cluster.yaml
b/test/e2e/e2e-banyandb-cluster.yaml
index 55bad01..44de4d5 100644
--- a/test/e2e/e2e-banyandb-cluster.yaml
+++ b/test/e2e/e2e-banyandb-cluster.yaml
@@ -61,6 +61,7 @@ setup:
--set banyandb.standalone.enabled=false \
--set banyandb.cluster.enabled=true \
--set banyandb.etcd.enabled=true \
+ --set banyandb.etcd.auth.enabled=false \
--set satellite.enabled=true \
--set satellite.image.repository=$SATELLITE_REPO \
--set satellite.image.tag=$SATELLITE_TAG \
diff --git a/test/e2e/e2e-banyandb-standalone.yaml
b/test/e2e/e2e-banyandb-standalone.yaml
index 49beeaa..c0b6adf 100644
--- a/test/e2e/e2e-banyandb-standalone.yaml
+++ b/test/e2e/e2e-banyandb-standalone.yaml
@@ -61,6 +61,7 @@ setup:
--set banyandb.standalone.enabled=true \
--set banyandb.cluster.enabled=false \
--set banyandb.etcd.enabled=false \
+ --set banyandb.auth.enabled=true \
--set satellite.enabled=true \
--set satellite.image.repository=$SATELLITE_REPO \
--set satellite.image.tag=$SATELLITE_TAG \
