Skip to content

Fix HelmChart reconciler appending login options when they do not exist#1904

Merged
matheuscscp merged 2 commits intomainfrom
fix-1902
Oct 3, 2025
Merged

Fix HelmChart reconciler appending login options when they do not exist#1904
matheuscscp merged 2 commits intomainfrom
fix-1902

Conversation

@matheuscscp
Copy link
Copy Markdown
Member

Fixes: #1902

Supersedes: #1903

This PR is restoring the code path from source-controller v1.6.2 where the TLS login option was only specified if there were login credentials also specified.

@stefanprodan I prefer merging this version that is a straightforward fix restoring the code path from 1.6.2 instead of revisiting this old TLS login option code in a patch release. I propose we revisit this in Flux 2.8. Please test this fix in your MacOS 🙏

Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
@matheuscscp matheuscscp added bug Something isn't working area/helm Helm related issues and pull requests labels Oct 3, 2025
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
@matheuscscp matheuscscp added the backport:release/v1.7.x To be backported to release/v1.7.x label Oct 3, 2025
Copy link
Copy Markdown
Member

@cappyzawa cappyzawa left a comment

Choose a reason for hiding this comment

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

Sorry for causing the regression 🙇
The issue was that a login attempt was being made even when no login options were provided, so the fix here is to early return if there are no options, right?

LGTM!

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

Tested on macOS and it works! Thanks @matheuscscp

@matheuscscp matheuscscp merged commit cbee72b into main Oct 3, 2025
7 checks passed
@matheuscscp matheuscscp deleted the fix-1902 branch October 3, 2025 09:03
@github-actions
Copy link
Copy Markdown

github-actions bot commented Oct 3, 2025

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

area/helm Helm related issues and pull requests backport:release/v1.7.x To be backported to release/v1.7.x bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Helm chart reconciler tries to login with empty credentials when TLS is set

3 participants