Skip to content
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

[Backport release-1.30] Cleanup unknown Helm chart manifest files #4717

Merged

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Jul 4, 2024

This way, the reconciliation gets as close as possible to the desired
state, even if some things in between are failing.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
(cherry picked from commit e0aa6a4)
This is an internal implementation detail of the extensions controller
and not an inherent property of the chart resource. Hence move the func
into the controller and make it private.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
(cherry picked from commit 394418d)
Keep track of the generated filenames when reconciling Helm Chart
extensions. After all files have been synchronized, remove any remaining
unknown Helm chart manifest files. This way the synchronization will
work correctly even if the Helm chart extension names and orders are
changed.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
(cherry picked from commit c1f8c75)
@twz123 twz123 added bug Something isn't working area/helm backport/release-1.29 PR that needs to be backported/cherrypicked to the release-1.29 branch labels Jul 4, 2024
@twz123 twz123 marked this pull request as ready for review July 5, 2024 07:54
@twz123 twz123 requested a review from a team as a code owner July 5, 2024 07:54
@twz123 twz123 merged commit e79d569 into k0sproject:release-1.30 Jul 8, 2024
80 checks passed
@twz123 twz123 deleted the backport-4705-to-release-1.30 branch July 8, 2024 17:38
@k0s-bot
Copy link

k0s-bot commented Jul 8, 2024

Backport failed for release-1.29, because it was unable to cherry-pick the commit(s).

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

git fetch origin release-1.29
git worktree add -d .worktree/backport-4717-to-release-1.29 origin/release-1.29
cd .worktree/backport-4717-to-release-1.29
git switch --create backport-4717-to-release-1.29
git cherry-pick -x 9db7b1e8eb2a7a093c7a42326822f3feb02c5b05 966dc5ec0b9658c04dab2f66f44a17e374ba4100 0e4db6a3b3db821884070448b10d99448632a443

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/helm backport/release-1.29 PR that needs to be backported/cherrypicked to the release-1.29 branch bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants