Skip to content

[Backport release-1.5] fix(platform): forward backupStorage overrides to the backupstrategy-controller Package - #3402

Merged
myasnikovdaniil merged 1 commit into
release-1.5from
backport-3333-to-release-1.5
Aug 19, 2026
Merged

[Backport release-1.5] fix(platform): forward backupStorage overrides to the backupstrategy-controller Package#3402
myasnikovdaniil merged 1 commit into
release-1.5from
backport-3333-to-release-1.5

Conversation

@github-actions

Copy link
Copy Markdown

Description

Backport of #3333 to release-1.5.

@github-actions

Copy link
Copy Markdown
Author

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-3333-to-release-1.5
git worktree add --checkout .worktree/backport-3333-to-release-1.5 backport-3333-to-release-1.5
cd .worktree/backport-3333-to-release-1.5
git reset --hard HEAD^
git cherry-pick -x 1422f8b78ac059d3a1001be2b4a2451e0e7bb74d e74c8cb4599096cd6c3f578d9ba27562b263e87b b4c1e44fd52c93580146e4a661d4971d18653344 a5dff22c515bdc537b5db3577eb796cf32b6f733 93de6adc04c9b7763e5985403da339c5ece3104a 0cd3fe20b8630a97142c69754128c6172f4ed057 7d117679d42ff27adbc33bfd65ddfa7f317417c3
git push --force-with-lease

…controller Package

Backport of #3333 onto release-1.5.

spec.components.platform.values.backupStorage on the
cozystack.cozystack-platform Package -- the documented override path for
the cozy-default BackupClass -- never reached the
backupstrategy-controller HelmRelease, so endpoint/region/bucketName
overrides for an external S3 were silently dropped (#3245). The platform
chart now forwards the block into the emitted child Package the same way
bundles/iaas.yaml forwards kubevirt and gpu-operator values. The 4-arg
cozystack.platform.package helper the change needs already exists on this
branch.

Two conflicts, both from unrelated drift in the touched files rather than
from the fix:

  * platform values.yaml -- main's hunk carries `monitoring.rootEnabled`
    alongside `backupStorage`. That key belongs to the tenant-root
    monitoring gate (#3181), which is not on release-1.5 and whose absence
    nothing here depends on, so only the backupStorage block is taken.

  * docs/operations/backup-classes.md -- the conflicting hunk rewrites the
    Postgres upgrade note for the CNPG barman plugin migration
    (spec.plugins + ObjectStore), which is 1.6 behaviour. release-1.5 still
    renders spec.backup.barmanObjectStore, so this branch keeps its own
    prose. The rest of the doc update applied cleanly and was checked
    claim-by-claim against this branch rather than assumed: the
    helmrelease-interval flag, the cozy-backup-controller namespace, the
    cozystack_backup_credentials_projection_* metric names and the
    provisionBucket / namespace / bucketName knobs the new table rows
    describe all exist here.

Assisted-By: Claude <noreply@anthropic.com>
Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
(cherry picked from commit 13aa3cb31e71f89e6ffe2a5fcd0fcd9e3f80e970)
@myasnikovdaniil
myasnikovdaniil force-pushed the backport-3333-to-release-1.5 branch from 0fa38a7 to 7abb7ec Compare July 31, 2026 05:28
@github-actions github-actions Bot added area/platform Issues or PRs related to platform infrastructure (bundle, flux, talos, installer) area/release Issues or PRs related to release tooling (changelog, backport, release pipeline) kind/bug Categorizes issue or PR as related to a bug size/L This PR changes 100-499 lines, ignoring generated files labels Jul 31, 2026
@myasnikovdaniil
myasnikovdaniil marked this pull request as ready for review August 4, 2026 09:08
@gemini-code-assist

Copy link
Copy Markdown
Contributor

Caution

The consumer version of Gemini Code Assist on GitHub has been sunset. All code review activity has officially ceased.

@myasnikovdaniil
myasnikovdaniil merged commit 33096de into release-1.5 Aug 19, 2026
10 of 12 checks passed
@myasnikovdaniil
myasnikovdaniil deleted the backport-3333-to-release-1.5 branch August 19, 2026 06:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/platform Issues or PRs related to platform infrastructure (bundle, flux, talos, installer) area/release Issues or PRs related to release tooling (changelog, backport, release pipeline) kind/bug Categorizes issue or PR as related to a bug size/L This PR changes 100-499 lines, ignoring generated files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants