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.28] Cleanup unknown Helm chart manifest files #4762

Merged
merged 4 commits into from
Jul 17, 2024

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Jul 12, 2024

twz123 added 4 commits July 12, 2024 16:52
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)
(cherry picked from commit 9db7b1e)
(cherry picked from commit 0b638de)
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)
(cherry picked from commit 966dc5e)
(cherry picked from commit 0cbc962)
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)
(cherry picked from commit 0e4db6a)
(cherry picked from commit bfaff3b)
@twz123 twz123 added bug Something isn't working area/helm backport/release-1.27 PR that needs to be backported/cherrypicked to release-1.27 branch labels Jul 12, 2024
@twz123 twz123 marked this pull request as ready for review July 12, 2024 15:26
@twz123 twz123 requested a review from a team as a code owner July 12, 2024 15:26
@twz123 twz123 requested review from ncopa and juanluisvaladas July 12, 2024 15:26
@twz123 twz123 merged commit 7211cde into k0sproject:release-1.28 Jul 17, 2024
77 checks passed
@twz123 twz123 deleted the backport-4737-to-release-1.28 branch July 17, 2024 14:13
@k0s-bot
Copy link

k0s-bot commented Jul 17, 2024

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

Please cherry-pick the changes locally.

git fetch origin release-1.27
git worktree add -d .worktree/backport-4762-to-release-1.27 origin/release-1.27
cd .worktree/backport-4762-to-release-1.27
git checkout -b backport-4762-to-release-1.27
ancref=$(git merge-base ea9eb8e776a793f3875d04a20fe3839e1229816d 6dc0306d495fd5095b41469d8d1034a44922229e)
git cherry-pick -x $ancref..6dc0306d495fd5095b41469d8d1034a44922229e

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

Successfully merging this pull request may close these issues.

3 participants