You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2026/04/03 00:47:29 UTC
(skywalking-banyandb-helm) branch master updated: Shard lifecycle report volume between lifecycle and FODC agent (#59)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb-helm.git
The following commit(s) were added to refs/heads/master by this push:
new eb0e8d4 Shard lifecycle report volume between lifecycle and FODC agent (#59)
eb0e8d4 is described below
commit eb0e8d4937c6bb4813135a137203f3fac1a8cbf4
Author: mrproliu <74...@qq.com>
AuthorDate: Fri Apr 3 08:47:23 2026 +0800
Shard lifecycle report volume between lifecycle and FODC agent (#59)
---
.github/workflows/e2e.ci.yaml | 2 +-
.github/workflows/publish-helm.yaml | 4 ++--
chart/templates/cluster_data_statefulset.yaml | 23 +++++++++++++++++++++--
chart/templates/cluster_liaison_statefulset.yaml | 1 +
chart/templates/standalone_statefulset.yaml | 1 +
test/e2e/values.fodc.yaml | 6 +++---
6 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/e2e.ci.yaml b/.github/workflows/e2e.ci.yaml
index 49d3a95..89839f6 100644
--- a/.github/workflows/e2e.ci.yaml
+++ b/.github/workflows/e2e.ci.yaml
@@ -58,7 +58,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Login to ghcr
- uses: docker/login-action@v1
+ uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
diff --git a/.github/workflows/publish-helm.yaml b/.github/workflows/publish-helm.yaml
index 2d6b2af..6725b38 100644
--- a/.github/workflows/publish-helm.yaml
+++ b/.github/workflows/publish-helm.yaml
@@ -40,7 +40,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Log in to the Container registry
- uses: docker/login-action@v1.10.0
+ uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
with:
registry: ${{ env.HUB }}
username: ${{ github.actor }}
@@ -51,4 +51,4 @@ jobs:
sed -i "s/^version: .*/version: $VERSION/" ${{ matrix.chart.path }}/Chart.yaml
helm dep up ${{ matrix.chart.path }}
helm package ${{ matrix.chart.path }}
- helm push ${{ matrix.chart.name }}-$VERSION.tgz oci://${{ env.HUB }}
\ No newline at end of file
+ helm push ${{ matrix.chart.name }}-$VERSION.tgz oci://${{ env.HUB }}
diff --git a/chart/templates/cluster_data_statefulset.yaml b/chart/templates/cluster_data_statefulset.yaml
index b7df673..0448112 100644
--- a/chart/templates/cluster_data_statefulset.yaml
+++ b/chart/templates/cluster_data_statefulset.yaml
@@ -315,6 +315,10 @@ spec:
- --container-names=data,lifecycle
- --poll-metrics-ports=2121,17915
- --cluster-state-ports=17912,17914
+ - --lifecycle-port=17912
+ {{- if $roleConfig.lifecycleSidecar.enabled }}
+ - --lifecycle-report-dir={{ default "/tmp/lifecycle-reports" $roleConfig.lifecycleSidecar.reportDir }}
+ {{- end }}
- --poll-metrics-interval={{ $.Values.cluster.fodc.agent.config.pollMetricsInterval }}
- --cluster-state-poll-interval={{ $.Values.cluster.fodc.agent.config.pollClusterStateInterval }}
- --prometheus-listen-addr=:{{ $.Values.cluster.fodc.agent.metricsPort }}
@@ -352,6 +356,11 @@ spec:
{{- end }}
{{- end }}
{{- end }}
+ {{- if $roleConfig.lifecycleSidecar.enabled }}
+ volumeMounts:
+ - name: lifecycle-report-shared
+ mountPath: {{ default "/tmp/lifecycle-reports" $roleConfig.lifecycleSidecar.reportDir }}
+ {{- end }}
{{- end }}
{{- if $roleConfig.backupSidecar.enabled }}
- name: backup
@@ -428,8 +437,9 @@ spec:
{{- if $roleConfig.lifecycleSidecar.reportDir }}
- "--report-dir={{ $roleConfig.lifecycleSidecar.reportDir }}"
{{- end }}
- {{- if $.Values.storage.data.enabled }}
+ {{- if or $.Values.storage.data.enabled $.Values.cluster.fodc.enabled }}
volumeMounts:
+ {{- if $.Values.storage.data.enabled }}
{{- range $claim := $.Values.storage.data.persistentVolumeClaims }}
{{- if eq $claim.nodeRole $roleName }}
{{- if $claim.existingClaimName }}
@@ -447,6 +457,11 @@ spec:
{{- end }}
{{- end }}
{{- end }}
+ {{- end }}
+ {{- if $.Values.cluster.fodc.enabled }}
+ - name: lifecycle-report-shared
+ mountPath: {{ default "/tmp/lifecycle-reports" $roleConfig.lifecycleSidecar.reportDir }}
+ {{- end }}
{{- end }}
{{- with $roleConfig.lifecycleSidecar.resources }}
resources:
@@ -501,7 +516,7 @@ spec:
{{- end }}
{{- end }}
- {{- if or $roleConfig.tls $schemaClientTls.secretName $schemaServerTls.secretName $nodeDiscoveryFileMode }}
+ {{- if or $roleConfig.tls $schemaClientTls.secretName $schemaServerTls.secretName $nodeDiscoveryFileMode (and $roleConfig.lifecycleSidecar.enabled $.Values.cluster.fodc.enabled) }}
volumes:
{{- if $roleConfig.tls }}
{{- if $roleConfig.tls.grpcSecretName }}
@@ -533,6 +548,10 @@ spec:
- key: {{ include "banyandb.nodeDiscoveryFileKey" $ }}
path: nodes.yaml
{{- end }}
+ {{- if and $roleConfig.lifecycleSidecar.enabled $.Values.cluster.fodc.enabled }}
+ - name: lifecycle-report-shared
+ emptyDir: {}
+ {{- end }}
{{- end }}
{{- if $roleConfig.tolerations }}
diff --git a/chart/templates/cluster_liaison_statefulset.yaml b/chart/templates/cluster_liaison_statefulset.yaml
index 78c59eb..bed1a36 100644
--- a/chart/templates/cluster_liaison_statefulset.yaml
+++ b/chart/templates/cluster_liaison_statefulset.yaml
@@ -289,6 +289,7 @@ spec:
- --container-names=liaison
- --poll-metrics-ports=2121
- --cluster-state-ports=18912
+ - --lifecycle-port=18912
- --cluster-state-poll-interval={{ .Values.cluster.fodc.agent.config.pollClusterStateInterval }}
- --poll-metrics-interval={{ .Values.cluster.fodc.agent.config.pollMetricsInterval }}
- --prometheus-listen-addr=:{{ .Values.cluster.fodc.agent.metricsPort }}
diff --git a/chart/templates/standalone_statefulset.yaml b/chart/templates/standalone_statefulset.yaml
index 4935aa8..231c0b3 100644
--- a/chart/templates/standalone_statefulset.yaml
+++ b/chart/templates/standalone_statefulset.yaml
@@ -250,6 +250,7 @@ spec:
- --container-names=standalone
- --poll-metrics-ports=2121
- --cluster-state-ports=17912
+ - --lifecycle-port=17912
- --cluster-state-poll-interval={{ .Values.cluster.fodc.agent.config.pollClusterStateInterval }}
- --poll-metrics-interval={{ .Values.cluster.fodc.agent.config.pollMetricsInterval }}
- --prometheus-listen-addr=:{{ .Values.cluster.fodc.agent.metricsPort }}
diff --git a/test/e2e/values.fodc.yaml b/test/e2e/values.fodc.yaml
index f019d1c..4ac1665 100644
--- a/test/e2e/values.fodc.yaml
+++ b/test/e2e/values.fodc.yaml
@@ -19,7 +19,7 @@
image:
repository: ghcr.io/apache/skywalking-banyandb
- tag: c27121f43c76b3b31470e2846f68958884ef91d6
+ tag: ee65a73536b58693ef219d36f1a1194a58b6cc49
pullPolicy: IfNotPresent
cluster:
@@ -269,7 +269,7 @@ cluster:
value: 512Mi
image:
repository: ghcr.io/apache/skywalking-banyandb-fodc-proxy
- tag: "931a605a47b2bbb0d171ae1ac12c466d4f3a2905"
+ tag: "ee65a73536b58693ef219d36f1a1194a58b6cc49"
pullPolicy: IfNotPresent
grpcSvc:
labels: {}
@@ -319,7 +319,7 @@ cluster:
agent:
image:
repository: ghcr.io/apache/skywalking-banyandb-fodc-agent
- tag: "931a605a47b2bbb0d171ae1ac12c466d4f3a2905"
+ tag: "ee65a73536b58693ef219d36f1a1194a58b6cc49"
pullPolicy: IfNotPresent
env: []
containerSecurityContext: {}