[Backport release-1.5] fix(platform): forward backupStorage overrides to the backupstrategy-controller Package - #3402
Merged
Conversation
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 |
Merged
11 tasks
…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
force-pushed
the
backport-3333-to-release-1.5
branch
from
July 31, 2026 05:28
0fa38a7 to
7abb7ec
Compare
myasnikovdaniil
marked this pull request as ready for review
August 4, 2026 09:08
Contributor
|
Caution The consumer version of Gemini Code Assist on GitHub has been sunset. All code review activity has officially ceased. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Backport of #3333 to
release-1.5.