Skip to content

Fix: skip trying to decrypt remote patches as local#1548

Merged
matheuscscp merged 1 commit intofluxcd:mainfrom
ljakimczuk:fix-remote-patches
Nov 17, 2025
Merged

Fix: skip trying to decrypt remote patches as local#1548
matheuscscp merged 1 commit intofluxcd:mainfrom
ljakimczuk:fix-remote-patches

Conversation

@ljakimczuk
Copy link
Copy Markdown
Contributor

@ljakimczuk ljakimczuk commented Nov 12, 2025

Fixes: #1544

Comment thread internal/decryptor/decryptor_test.go Outdated
Comment thread internal/decryptor/decryptor.go Outdated
Comment thread internal/decryptor/decryptor.go Outdated
Comment thread internal/decryptor/decryptor.go Outdated
Copy link
Copy Markdown
Member

@matheuscscp matheuscscp left a comment

Choose a reason for hiding this comment

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

LGTM! 🚀

@matheuscscp matheuscscp added the backport:release/v1.7.x To be backported to release/v1.7.x label Nov 17, 2025
@matheuscscp
Copy link
Copy Markdown
Member

Can you please squash?

Signed-off-by: Łukasz Jakimczuk <ljakimczuk@gmail.com>
@ljakimczuk
Copy link
Copy Markdown
Contributor Author

Can you please squash?

@matheuscscp done, had to force push

Copy link
Copy Markdown
Member

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks @ljakimczuk

@matheuscscp matheuscscp merged commit cf42b7f into fluxcd:main Nov 17, 2025
5 checks passed
@fluxcdbot
Copy link
Copy Markdown
Member

Successfully created backport PR for release/v1.7.x:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:release/v1.7.x To be backported to release/v1.7.x

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug / regression: starting with Flux 2.5.0, cannot use remote patches with decryption enabled

4 participants