Skip to content

[backport v2.10.7] Preserve valid user-supplied chart values in rke2 form #14323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: release-2.10
Choose a base branch
from

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented May 9, 2025

This is an automated request to port PR #14261 by @rak-phillip

fixes #14074

Original PR body:

Summary

This adds a wider range of valid charts to be applied to user-supplied chart values; these additional charts will prevent these values from being removed from user-supplied yaml if they match.

Fixes #12002

Occurred changes and/or fixed issues

  • Add additional rke2 charts to the collection of accepted chart values in rkeconfig

Technical notes summary

The initial implementation of applyChartValues() only takes into account addons, but that doesn't appear to be the correct approach for this method because there's a wider range of potential valid charts available.

I don't think that it makes sense for the form to pave over user values without notifying them of such a change - this is the root cause of the issue. A better approach would be to parse the user-supplied charts and notify the user of any potential issues, leaving the responsibility the the user to resolve any problems. Ultimately, making such a change in behavior is outside of the scope of this issue, but I think patterns like these can be helpful in future development.

Areas or cases that should be tested

The associated issue has sufficient reproduction steps.

Areas which could experience regressions

This is purely additive. This could cause problems if any of these rke2 charts are not intended to be in the rkeconfig charts.

Screenshot/Video

NA

Checklist

  • The PR is linked to an issue and the linked issue has a Milestone, or no issue is needed
  • The PR has a Milestone
  • The PR template has been filled out
  • The PR has been self reviewed
  • The PR has a reviewer assigned
  • The PR has automated tests or clear instructions for manual tests and the linked issue has appropriate QA labels, or tests are not needed
  • The PR has reviewed with UX and tested in light and dark mode, or there are no UX changes

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@github-actions github-actions bot added this to the v2.10.6 milestone May 9, 2025
@rak-phillip rak-phillip modified the milestones: v2.10.6, v2.10.7 May 9, 2025
@rak-phillip rak-phillip changed the title [backport v2.10.6] Preserve valid user-supplied chart values in rke2 form [backport v2.10.7] Preserve valid user-supplied chart values in rke2 form May 9, 2025
@rak-phillip rak-phillip requested a review from torchiaf May 9, 2025 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant