This is an automated email from the ASF dual-hosted git repository. liuhan pushed a commit to branch backup-lifecycle-resource in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb-helm.git
commit 854e30fdcdef4d7cd4013e564e3f6778e052461d Author: mrproliu <[email protected]> AuthorDate: Mon Jan 26 19:11:24 2026 +0800 fix wrong format of backup/lifecycle resource --- chart/templates/cluster_data_statefulset.yaml | 44 +++++++++++++-------------- test/e2e/values.lifecycle.yaml | 22 ++++++++++++++ 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/chart/templates/cluster_data_statefulset.yaml b/chart/templates/cluster_data_statefulset.yaml index bd6f698..93e4483 100644 --- a/chart/templates/cluster_data_statefulset.yaml +++ b/chart/templates/cluster_data_statefulset.yaml @@ -118,15 +118,15 @@ spec: {{- if eq $claim.nodeRole $roleName }} {{- if $claim.existingClaimName }} {{- range $claim.mountTargets }} - - mountPath: /tmp/{{ . }} + - mountPath: "/tmp/{{ . }}" name: {{ $claim.existingClaimName }} - subPath: {{ . }} + subPath: {{ . | quote }} {{- end }} {{- else }} {{- range $claim.mountTargets }} - - mountPath: /tmp/{{ . }} + - mountPath: "/tmp/{{ . }}" name: {{ $claim.claimName }} - subPath: {{ . }} + subPath: {{ . | quote }} {{- end }} {{- end }} {{- end }} @@ -267,15 +267,15 @@ spec: {{- if eq $claim.nodeRole $roleName }} {{- if $claim.existingClaimName }} {{- range $claim.mountTargets }} - - mountPath: /tmp/{{ . }} + - mountPath: "/tmp/{{ . }}" name: {{ $claim.existingClaimName }} - subPath: {{ . }} + subPath: {{ . | quote }} {{- end }} {{- else }} {{- range $claim.mountTargets }} - - mountPath: /tmp/{{ . }} + - mountPath: "/tmp/{{ . }}" name: {{ $claim.claimName }} - subPath: {{ . }} + subPath: {{ . | quote }} {{- end }} {{- end }} {{- end }} @@ -364,15 +364,15 @@ spec: {{- if eq $claim.nodeRole $roleName }} {{- if $claim.existingClaimName }} {{- range $claim.mountTargets }} - - mountPath: /tmp/{{ . }} + - mountPath: "/tmp/{{ . }}" name: {{ $claim.existingClaimName }} - subPath: {{ . }} + subPath: {{ . | quote }} {{- end }} {{- else }} {{- range $claim.mountTargets }} - - mountPath: /tmp/{{ . }} + - mountPath: "/tmp/{{ . }}" name: {{ $claim.claimName }} - subPath: {{ . }} + subPath: {{ . | quote }} {{- end }} {{- end }} {{- end }} @@ -380,7 +380,7 @@ spec: {{- end }} {{- with $roleConfig.backupSidecar.resources }} resources: - {{- toYaml . | nindent 4 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- end }} {{- if $roleConfig.lifecycleSidecar.enabled }} @@ -428,15 +428,15 @@ spec: {{- if eq $claim.nodeRole $roleName }} {{- if $claim.existingClaimName }} {{- range $claim.mountTargets }} - - mountPath: /tmp/{{ . }} + - mountPath: "/tmp/{{ . }}" name: {{ $claim.existingClaimName }} - subPath: {{ . }} + subPath: {{ . | quote }} {{- end }} {{- else }} {{- range $claim.mountTargets }} - - mountPath: /tmp/{{ . }} + - mountPath: "/tmp/{{ . }}" name: {{ $claim.claimName }} - subPath: {{ . }} + subPath: {{ . | quote }} {{- end }} {{- end }} {{- end }} @@ -444,7 +444,7 @@ spec: {{- end }} {{- with $roleConfig.lifecycleSidecar.resources }} resources: - {{- toYaml . | nindent 4 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- end }} {{- range $sidecar := $roleConfig.sidecar }} @@ -468,15 +468,15 @@ spec: {{- if eq $claim.nodeRole $roleName }} {{- if $claim.existingClaimName }} {{- range $claim.mountTargets }} - - mountPath: /tmp/{{ . }} + - mountPath: "/tmp/{{ . }}" name: {{ $claim.existingClaimName }} - subPath: {{ . }} + subPath: {{ . | quote }} {{- end }} {{- else }} {{- range $claim.mountTargets }} - - mountPath: /tmp/{{ . }} + - mountPath: "/tmp/{{ . }}" name: {{ $claim.claimName }} - subPath: {{ . }} + subPath: {{ . | quote }} {{- end }} {{- end }} {{- end }} 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
