Skip to content

[mariadb][backup-v2] add Ceph S3 backup backend support #11037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
s10 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[mariadb][backup-v2] add Ceph S3 backup backend support #11037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions common/mariadb/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## v0.34.0 - 2026/03/13
* Add Ceph S3 storage backend support for `maria-back-me-up` backup configuration
* new `backup_v2.ceph_s3` section with dedicated credential paths, custom endpoint, and path-style URL support
* enables Ceph-only, Ceph + AWS dual-write, and other flexible storage combinations
* Make AWS SSE-C fields conditional. `sse_customer_algorithm` and `sse_customer_key` are only rendered when `sse_customer_key` is configured
* Fix Swift template to use `values.yaml` fields instead of hardcoded values (`user_name`, `user_domain_name`, `project_name`, `project_domain_name`)

## v0.33.0 - 2026/03/03
* Add InnoDB buffer pool Prometheus alerts: `MariaDBBufferPoolNearlyFull` (warning, < 10% free) and `MariaDBBufferPoolExhausted` (critical, < 2.5% free)

Expand Down
2 changes: 1 addition & 1 deletion common/mariadb/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v2
description: A Helm chart for Kubernetes
name: mariadb
version: 0.33.0
version: 0.34.0
# scripts/docker-entyrpoint.sh should be updated when appVersion is updated
appVersion: 10.11.16
dependencies:
Expand Down
7 changes: 7 additions & 0 deletions common/mariadb/ci/test-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,16 @@ global:
backup_v2:
aws_access_key_id: superSecret
aws_secret_access_key: superSecret
ceph_s3_access_key_id: superSecret
ceph_s3_secret_access_key: superSecret
mariadb:
backup_v2:
aws:
region: local
sse_customer_key: superSecret
ceph_s3:
endpoint: "https://ceph-s3.local.example.com"
region: default

test_db_host: testRelease-mariadb.svc
root_password: secret123
Expand All @@ -29,6 +34,8 @@ backup_v2:
enabled: true
swift:
password: superSecret
ceph_s3:
enabled: true

users:
test:
Expand Down
28 changes: 22 additions & 6 deletions common/mariadb/templates/config/_backup_config.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,41 @@ database:
- "{{$tl}}"
{{- end }}
storages:
{{- if .Values.backup_v2.aws.enabled }}
{{- if or .Values.backup_v2.aws.enabled .Values.backup_v2.ceph_s3.enabled }}
s3:
{{- if .Values.backup_v2.aws.enabled }}
- name: aws-{{ .Values.global.mariadb.backup_v2.aws.region }}
aws_access_key_id: {{ include "mariadb.resolve_secret_squote" .Values.global.backup_v2.aws_access_key_id }}
aws_secret_access_key: {{ include "mariadb.resolve_secret_squote" .Values.global.backup_v2.aws_secret_access_key }}
region: {{ .Values.global.mariadb.backup_v2.aws.region }}
bucket_name: "mariadb-backup-{{ .Values.global.region }}"
{{- if .Values.global.mariadb.backup_v2.aws.sse_customer_key }}
sse_customer_algorithm: "AES256"
sse_customer_key: {{ include "mariadb.resolve_secret_squote" .Values.global.mariadb.backup_v2.aws.sse_customer_key }}
{{- end }}
{{- end }}
{{- if .Values.backup_v2.ceph_s3.enabled }}
- name: ceph-{{ .Values.global.region }}
aws_access_key_id: {{ include "mariadb.resolve_secret_squote" .Values.global.backup_v2.ceph_s3_access_key_id }}
aws_secret_access_key: {{ include "mariadb.resolve_secret_squote" .Values.global.backup_v2.ceph_s3_secret_access_key }}
aws_endpoint: {{ .Values.global.mariadb.backup_v2.ceph_s3.endpoint | required "global.mariadb.backup_v2.ceph_s3.endpoint is required when ceph_s3 is enabled" | quote }}
s3_force_path_style: {{ .Values.backup_v2.ceph_s3.force_path_style }}
region: {{ .Values.global.mariadb.backup_v2.ceph_s3.region | default "default" }}
bucket_name: {{ .Values.global.mariadb.backup_v2.ceph_s3.bucket_name | default (printf "mariadb-backup-%s" .Values.global.region) | quote }}
{{- if .Values.backup_v2.ceph_s3.verify }}
verify: true
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.backup_v2.swift.enabled }}
swift:
- name: swift-{{ .Values.global.region }}
auth_version: 3
auth_version: {{ .Values.backup_v2.swift.auth_version }}
auth_url: "https://identity-3.{{ .Values.global.region }}.cloud.sap/v3"
user_name: db_backup
user_domain_name: Default
project_name: master
project_domain_name: ccadmin
user_name: {{ .Values.backup_v2.swift.user_name }}
user_domain_name: {{ .Values.backup_v2.swift.user_domain_name }}
project_name: {{ .Values.backup_v2.swift.project_name }}
project_domain_name: {{ .Values.backup_v2.swift.project_domain_name }}
password: {{ include "mariadb.resolve_secret_squote" .Values.backup_v2.swift.password | required "Please set .Values.backup_v2.swift.password" }}
region: {{ .Values.global.region }}
container_name: "mariadb-backup-{{ .Values.global.region }}"
Expand Down
4 changes: 4 additions & 0 deletions common/mariadb/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ backup_v2:
run_after_inc_backups: 12
aws:
enabled: true
ceph_s3:
enabled: false
force_path_style: true
verify: false
swift:
enabled: true
user_name: db_backup
Expand Down