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 83db081 fix wrong format of backup/lifecycle/fodc resource (#49)
83db081 is described below
commit 83db0812ed36cdc6ecc09f4563354e3bb5bdf4f4
Author: mrproliu <[email protected]>
AuthorDate: Tue Jan 27 10:34:11 2026 +0800
fix wrong format of backup/lifecycle/fodc resource (#49)
---
chart/templates/cluster_data_statefulset.yaml | 39 ++++++++++++++++++++--
chart/templates/cluster_fodc_proxy_deployment.yaml | 20 ++++++++---
chart/templates/cluster_liaison_statefulset.yaml | 13 +++++++-
chart/templates/standalone_statefulset.yaml | 13 +++++++-
chart/values.yaml | 10 +++---
test/e2e/values.fodc.yaml | 25 ++++++++++----
test/e2e/values.lifecycle.yaml | 22 ++++++++++++
7 files changed, 122 insertions(+), 20 deletions(-)
diff --git a/chart/templates/cluster_data_statefulset.yaml
b/chart/templates/cluster_data_statefulset.yaml
index bd6f698..24283bc 100644
--- a/chart/templates/cluster_data_statefulset.yaml
+++ b/chart/templates/cluster_data_statefulset.yaml
@@ -335,7 +335,18 @@ spec:
containerPort: {{ $.Values.cluster.fodc.agent.metricsPort }}
{{- if and $.Values.cluster.fodc.agent.resources (or
$.Values.cluster.fodc.agent.resources.requests
$.Values.cluster.fodc.agent.resources.limits) }}
resources:
-{{ toYaml $.Values.cluster.fodc.agent.resources | indent 12 }}
+ {{- if $.Values.cluster.fodc.agent.resources.requests }}
+ requests:
+ {{- range $request :=
$.Values.cluster.fodc.agent.resources.requests }}
+ {{ $request.key }}: {{ $request.value }}
+ {{- end }}
+ {{- end }}
+ {{- if $.Values.cluster.fodc.agent.resources.limits }}
+ limits:
+ {{- range $limit := $.Values.cluster.fodc.agent.resources.limits
}}
+ {{ $limit.key }}: {{ $limit.value }}
+ {{- end }}
+ {{- end }}
{{- end }}
{{- end }}
{{- if $roleConfig.backupSidecar.enabled }}
@@ -380,7 +391,18 @@ spec:
{{- end }}
{{- with $roleConfig.backupSidecar.resources }}
resources:
- {{- toYaml . | nindent 4 }}
+ {{- if $roleConfig.backupSidecar.resources.requests }}
+ requests:
+ {{- range $request :=
$roleConfig.backupSidecar.resources.requests }}
+ {{ $request.key }}: {{ $request.value }}
+ {{- end }}
+ {{- end }}
+ {{- if $roleConfig.backupSidecar.resources.limits }}
+ limits:
+ {{- range $limit := $roleConfig.backupSidecar.resources.limits }}
+ {{ $limit.key }}: {{ $limit.value }}
+ {{- end }}
+ {{- end }}
{{- end }}
{{- end }}
{{- if $roleConfig.lifecycleSidecar.enabled }}
@@ -444,7 +466,18 @@ spec:
{{- end }}
{{- with $roleConfig.lifecycleSidecar.resources }}
resources:
- {{- toYaml . | nindent 4 }}
+ {{- if $roleConfig.lifecycleSidecar.resources.requests }}
+ requests:
+ {{- range $request :=
$roleConfig.lifecycleSidecar.resources.requests }}
+ {{ $request.key }}: {{ $request.value }}
+ {{- end }}
+ {{- end }}
+ {{- if $roleConfig.lifecycleSidecar.resources.limits }}
+ limits:
+ {{- range $limit :=
$roleConfig.lifecycleSidecar.resources.limits }}
+ {{ $limit.key }}: {{ $limit.value }}
+ {{- end }}
+ {{- end }}
{{- end }}
{{- end }}
{{- range $sidecar := $roleConfig.sidecar }}
diff --git a/chart/templates/cluster_fodc_proxy_deployment.yaml
b/chart/templates/cluster_fodc_proxy_deployment.yaml
index 428c1f1..e807992 100644
--- a/chart/templates/cluster_fodc_proxy_deployment.yaml
+++ b/chart/templates/cluster_fodc_proxy_deployment.yaml
@@ -104,11 +104,21 @@ spec:
timeoutSeconds: {{
.Values.cluster.fodc.proxy.startupProbe.timeoutSeconds }}
successThreshold: {{
.Values.cluster.fodc.proxy.startupProbe.successThreshold }}
failureThreshold: {{
.Values.cluster.fodc.proxy.startupProbe.failureThreshold }}
-
- {{- if and .Values.cluster.fodc.proxy.resources (or
.Values.cluster.fodc.proxy.resources.requests
.Values.cluster.fodc.proxy.resources.limits) }}
- resources:
-{{ toYaml .Values.cluster.fodc.proxy.resources | indent 8 }}
- {{- end }}
+ {{- if and .Values.cluster.fodc.proxy.resources (or
.Values.cluster.fodc.proxy.resources.requests
.Values.cluster.fodc.proxy.resources.limits) }}
+ resources:
+ {{- if .Values.cluster.fodc.proxy.resources.requests }}
+ requests:
+ {{- range $request :=
.Values.cluster.fodc.proxy.resources.requests }}
+ {{ $request.key }}: {{ $request.value }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.cluster.fodc.proxy.resources.limits }}
+ limits:
+ {{- range $limit := .Values.cluster.fodc.proxy.resources.limits
}}
+ {{ $limit.key }}: {{ $limit.value }}
+ {{- end }}
+ {{- end }}
+ {{- end }}
{{- if .Values.cluster.fodc.proxy.tolerations }}
tolerations:
diff --git a/chart/templates/cluster_liaison_statefulset.yaml
b/chart/templates/cluster_liaison_statefulset.yaml
index 3473428..f0f0333 100644
--- a/chart/templates/cluster_liaison_statefulset.yaml
+++ b/chart/templates/cluster_liaison_statefulset.yaml
@@ -325,7 +325,18 @@ spec:
containerPort: {{ .Values.cluster.fodc.agent.metricsPort }}
{{- if and .Values.cluster.fodc.agent.resources (or
.Values.cluster.fodc.agent.resources.requests
.Values.cluster.fodc.agent.resources.limits) }}
resources:
-{{ toYaml .Values.cluster.fodc.agent.resources | indent 12 }}
+ {{- if .Values.cluster.fodc.agent.resources.requests }}
+ requests:
+ {{- range $request :=
.Values.cluster.fodc.agent.resources.requests }}
+ {{ $request.key }}: {{ $request.value }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.cluster.fodc.agent.resources.limits }}
+ limits:
+ {{- range $limit := .Values.cluster.fodc.agent.resources.limits
}}
+ {{ $limit.key }}: {{ $limit.value }}
+ {{- end }}
+ {{- end }}
{{- end }}
{{- end }}
diff --git a/chart/templates/standalone_statefulset.yaml
b/chart/templates/standalone_statefulset.yaml
index eb3f34c..5e2f47e 100644
--- a/chart/templates/standalone_statefulset.yaml
+++ b/chart/templates/standalone_statefulset.yaml
@@ -273,7 +273,18 @@ spec:
containerPort: {{ .Values.cluster.fodc.agent.metricsPort }}
{{- if and .Values.cluster.fodc.agent.resources (or
.Values.cluster.fodc.agent.resources.requests
.Values.cluster.fodc.agent.resources.limits) }}
resources:
-{{ toYaml .Values.cluster.fodc.agent.resources | indent 12 }}
+ {{- if .Values.cluster.fodc.agent.resources.requests }}
+ requests:
+ {{- range $request :=
.Values.cluster.fodc.agent.resources.requests }}
+ {{ $request.key }}: {{ $request.value }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.cluster.fodc.agent.resources.limits }}
+ limits:
+ {{- range $limit := .Values.cluster.fodc.agent.resources.limits
}}
+ {{ $limit.key }}: {{ $limit.value }}
+ {{- end }}
+ {{- end }}
{{- end }}
{{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
index c601d65..9fb5aa8 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -868,9 +868,9 @@ cluster:
## Resource requests/limits for Proxy
resources:
## @param cluster.fodc.proxy.resources.requests Resource requests for
Proxy pods
- requests: {}
+ requests: []
## @param cluster.fodc.proxy.resources.limits Resource limits for
Proxy pods
- limits: {}
+ limits: []
image:
## @param cluster.fodc.proxy.image.repository Docker repository for
FODC Proxy
repository: ghcr.io/apache/skywalking-banyandb-fodc-proxy
@@ -977,10 +977,12 @@ cluster:
resources:
## @param cluster.fodc.agent.resources.requests Resource requests for
Agent
requests:
- memory: 256Mi
+ - key: memory
+ value: 256Mi
## @param cluster.fodc.agent.resources.limits Resource limits for Agent
limits:
- memory: 256Mi
+ - key: memory
+ value: 256Mi
## @param cluster.fodc.agent.metricsPort Metrics port for Agent sidecar
(prometheus-listen-addr flag)
metricsPort: 9090
config:
diff --git a/test/e2e/values.fodc.yaml b/test/e2e/values.fodc.yaml
index 18451e5..a67efd8 100644
--- a/test/e2e/values.fodc.yaml
+++ b/test/e2e/values.fodc.yaml
@@ -254,8 +254,16 @@ cluster:
podAffinityPreset: ""
podAntiAffinityPreset: soft
resources:
- requests: {}
- limits: {}
+ requests:
+ - key: cpu
+ value: 200m
+ - key: memory
+ value: 128Mi
+ limits:
+ - key: cpu
+ value: 500m
+ - key: memory
+ value: 512Mi
image:
repository: ghcr.io/apache/skywalking-banyandb-fodc-proxy
tag: "67cb3eaa71d1b2ba9a56dddc17050fd69da78593"
@@ -313,11 +321,16 @@ cluster:
env: []
containerSecurityContext: {}
resources:
- requests: {
- memory: 256Mi
- }
+ requests:
+ - key: cpu
+ value: 200m
+ - key: memory
+ value: 128Mi
limits:
- memory: 256Mi
+ - key: cpu
+ value: 500m
+ - key: memory
+ value: 512Mi
metricsPort: 9090
config:
pollMetricsInterval: 15s
diff --git a/test/e2e/values.lifecycle.yaml b/test/e2e/values.lifecycle.yaml
index af24ab0..7d811f3 100644
--- a/test/e2e/values.lifecycle.yaml
+++ b/test/e2e/values.lifecycle.yaml
@@ -193,12 +193,34 @@ cluster:
enabled: true
progressFile: "/tmp/stream/lifecycle/progress.json"
reportDir: "/tmp/stream/lifecycle/reports"
+ resources:
+ requests:
+ - key: cpu
+ value: 200m
+ - key: memory
+ value: 128Mi
+ limits:
+ - key: cpu
+ value: 500m
+ - key: memory
+ value: 512Mi
warm:
lifecycleSidecar:
schedule: "@daily"
enabled: true
progressFile: "/tmp/stream/lifecycle/progress.json"
reportDir: "/tmp/stream/lifecycle/reports"
+ resources:
+ requests:
+ - key: cpu
+ value: 200m
+ - key: memory
+ value: 128Mi
+ limits:
+ - key: cpu
+ value: 500m
+ - key: memory
+ value: 512Mi
cold:
replicas: 1
