Skip to content

[Backport release-1.6] fix(registry): preserve write options in aggregated storage - #4370

Merged
myasnikovdaniil merged 5 commits into
release-1.6from
backport-3937-to-release-1.6
Sep 23, 2026
Merged

myasnikovdaniil merged 5 commits into
release-1.6from
backport-3937-to-release-1.6

Conversation

@github-actions

Copy link
Copy Markdown

Description

Backport of #3937 to release-1.6.

@github-actions

Copy link
Copy Markdown
Author

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

git fetch origin backport-3937-to-release-1.6
git worktree add --checkout .worktree/backport-3937-to-release-1.6 backport-3937-to-release-1.6
cd .worktree/backport-3937-to-release-1.6
git reset --hard HEAD^
git cherry-pick -x a9812477e2d89fab070eb9e1fe177785cc9391e1 a20c7069401b3be4d016324978c32c58a796e1ac 39da2300d20ad278c5f850fa1d49fd416885e0c2 29351bd7fa018b965d749ad27eac88e4819b8884 1b576bc63868aa766a920a10e9966ba04abbd6f1
git push --force-with-lease

@coderabbitai

coderabbitai Bot commented Sep 22, 2026 •

Copy link
Copy Markdown
Contributor

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: cozystack/cozystack/.coderabbit.yaml

Review profile: CHILL

Plan: Advanced

Run ID: 8497cadf-d16c-4b4b-98f5-21660e556f27

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

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.

Signed-off-by: Yan Bondarenko <[email protected]>
Assisted-by: LLM
(cherry picked from commit a981247)
Signed-off-by: Myasnikov Daniil <[email protected]>
Dry-run must expose the same deletion state as a real request without
persisting it. Shared option objects can hide dropped fields in tests,
and an unreachable patch method offers no API coverage.

Signed-off-by: Yan Bondarenko <[email protected]>
Assisted-by: LLM
(cherry picked from commit a20c706)
Signed-off-by: Myasnikov Daniil <[email protected]>
Aggregated endpoints must retain backend HTTP codes and reasons so
clients can distinguish conflicts and admission failures. Dry-run
deletion also depends on current finalizers, which a cached read can miss.

Signed-off-by: Yan Bondarenko <[email protected]>
Assisted-by: LLM
(cherry picked from commit 39da230)
Signed-off-by: Myasnikov Daniil <[email protected]>
Backing resource names are not part of the aggregated API contract.
Clients need the requested resource identity and the original status
code and reason to handle rejected writes consistently.

Signed-off-by: Yan Bondarenko <[email protected]>
Assisted-by: LLM
(cherry picked from commit 29351bd)
Signed-off-by: Myasnikov Daniil <[email protected]>
WrapPreservingStatus rewrites Group, Kind and Name of a backend status to
the aggregated resource but left Details.UID as the HelmRelease's, so a
client that keys on details saw an identity the tenant cannot look up.
The UID goes with the rest of the remap, and a test pins it.

Signed-off-by: Yan Bondarenko <[email protected]>
Assisted-by: LLM
(cherry picked from commit 1b576bc)
Signed-off-by: Myasnikov Daniil <[email protected]>
@myasnikovdaniil
myasnikovdaniil force-pushed the backport-3937-to-release-1.6 branch from c55bfbf to 08a5cf9 Compare September 23, 2026 10:26
@github-actions github-actions Bot added size/XXL This PR changes 1000+ lines, ignoring generated files 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 Sep 23, 2026
@myasnikovdaniil
myasnikovdaniil marked this pull request as ready for review September 23, 2026 12:03
@myasnikovdaniil
myasnikovdaniil merged commit e8e1ec2 into release-1.6 Sep 23, 2026
40 checks passed
@myasnikovdaniil
myasnikovdaniil deleted the backport-3937-to-release-1.6 branch September 23, 2026 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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/XXL This PR changes 1000+ lines, ignoring generated files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants