Skip to content

[Backport release-1.2] fix(mariadb): remove duplicate template key in backup CronJob#2652

Merged
kvaps merged 1 commit into
release-1.2from
fix/mariadb-backup-duplicate-key-release-1.2
May 14, 2026
Merged

[Backport release-1.2] fix(mariadb): remove duplicate template key in backup CronJob#2652
kvaps merged 1 commit into
release-1.2from
fix/mariadb-backup-duplicate-key-release-1.2

Conversation

@kvaps
Copy link
Copy Markdown
Member

@kvaps kvaps commented May 14, 2026

Summary

Minimal backport from #2279 to release-1.2 — only the duplicate-template: key removal in packages/apps/mariadb/templates/backup-cronjob.yaml, without the breaking service-naming / forced-replication changes from #2279 (those are not appropriate for a patch release).

Fixes the yaml: unmarshal errors: line 17: mapping key "template" already defined at line 14 error when deploying MariaDB with backup.enabled: true on v1.2.x.

Related: #2293

Test plan

  • helm template of the mariadb chart with backup.enabled: true renders without YAML duplicate-key errors
  • CronJob deploys successfully on a v1.2.x cluster

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 14, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 0d540151-d9c3-4b18-a70c-3c2de107106c

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/mariadb-backup-duplicate-key-release-1.2

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions Bot added the size/XS This PR changes 0-9 lines, ignoring generated files label May 14, 2026
@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a deployment issue in the MariaDB chart for the release-1.2 branch. By eliminating a redundant key in the CronJob template, the configuration now adheres to valid YAML syntax, ensuring that deployments with backups enabled can proceed without encountering unmarshal errors.

Highlights

New Features

🧠 You can now enable Memory (public preview) to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize the Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counterproductive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@github-actions github-actions Bot added area/database Issues or PRs related to managed databases (postgres, mariadb, redis, etcd, kafka, clickhouse) area/release Issues or PRs related to release tooling (changelog, backport, release pipeline) kind/bug Categorizes issue or PR as related to a bug labels May 14, 2026
@dosubot dosubot Bot added the backport Should change be backported on previous release label May 14, 2026
Minimal backport from #2279 to release-1.2 — only the dup-key removal,
without the breaking service-naming / replication changes.

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
Co-Authored-By: Claude <noreply@anthropic.com>
@kvaps kvaps force-pushed the fix/mariadb-backup-duplicate-key-release-1.2 branch from 0738390 to af91ad5 Compare May 14, 2026 09:03
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request cleans up the MariaDB backup CronJob template by removing a redundant template specification block. The review feedback indicates that the pull request body is missing the mandatory release-note block required by the project's style guide.

@@ -13,9 +13,6 @@ spec:
jobTemplate:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

low

The pull request body is missing the required release-note block. According to the repository style guide, every PR must include a release note block in the following format:

```release-note
type(scope): human-readable changelog entry

<details>
<summary>References</summary>

1. PR body must contain a release note block. Flag any PR whose body has no release-note block. <sup>([link](https://github.com/cozystack/cozystack/blob/main/.gemini/styleguide.md))</sup>
</details>

@kvaps kvaps merged commit 4a67b81 into release-1.2 May 14, 2026
9 checks passed
@kvaps kvaps deleted the fix/mariadb-backup-duplicate-key-release-1.2 branch May 14, 2026 10:15
@kvaps kvaps mentioned this pull request May 14, 2026
4 tasks
kvaps added a commit that referenced this pull request May 14, 2026
## Summary

Adds `docs/changelogs/v1.2.4.md` so the `Update Release Notes` workflow
can publish the existing `v1.2.4` draft release.

`v1.2.4` is a hotfix patch backporting only the duplicate-`template:`
key removal from #2279 — the breaking service-naming changes in that PR
were intentionally omitted as not appropriate for a patch (see #2652 for
the minimal-backport details).

The `Generate Changelog` step on the tag-push workflow failed twice in a
row (yesterday's cron run and today's manual dispatch) due to `402 You
have no quota` on the Copilot API, so this changelog is hand-written
following `docs/changelogs/patch-template.md` and matches the v1.2.3
style.

## Test plan
- [x] file follows `patch-template.md` structure
- [x] author attribution verified against `gh pr view` for #2279 and
#2652
- [ ] CI passes
- [ ] after merge, `Update Release Notes` picks up the file and
publishes draft release `v1.2.4`
kvaps added a commit to kvaps/cozystack that referenced this pull request May 14, 2026
Hand-written patch changelog for v1.2.4 (Copilot quota exhausted on the
automatic Generate Changelog step). Single fix: minimal backport of the
MariaDB backup CronJob duplicate-key removal from cozystack#2279 via cozystack#2652.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/database Issues or PRs related to managed databases (postgres, mariadb, redis, etcd, kafka, clickhouse) area/release Issues or PRs related to release tooling (changelog, backport, release pipeline) backport Should change be backported on previous release kind/bug Categorizes issue or PR as related to a bug size/XS This PR changes 0-9 lines, ignoring generated files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant