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.27] Fix helm race condition #3650

Merged
merged 3 commits into from
Oct 27, 2023

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Oct 26, 2023

This field isn't honored at all and we want to remove concurrent
reconciliation anyway so entirely remove the field.

Signed-off-by: Juan Luis de Sousa-Valadas Castaño <[email protected]>
(cherry picked from commit 04ed903)
(cherry picked from commit 293475c)
Helm is unable to reconcile multiple charts at the same time because
/var/lib/k0s/helmhome/cache/ is shared between charts and helm cache was
not designed to be safe to be used concurrently.

Signed-off-by: Juan Luis de Sousa-Valadas Castaño <[email protected]>
(cherry picked from commit e49166c)
(cherry picked from commit b0de723)
Up to now there was a context passed but it was never cancelled.

Signed-off-by: Juan Luis de Sousa-Valadas Castaño <[email protected]>
(cherry picked from commit 62f0a7e)
(cherry picked from commit 15c1c93)
@twz123 twz123 added bug Something isn't working area/helm backport/release-1.26 PR that needs to be backported/cherrypicked to release-1.26 branch labels Oct 26, 2023
@twz123 twz123 requested a review from a team as a code owner October 26, 2023 15:34
@twz123 twz123 merged commit 0076936 into k0sproject:release-1.27 Oct 27, 2023
71 checks passed
@twz123 twz123 deleted the backport-3649-to-release-1.27 branch October 27, 2023 17:29
@k0s-bot
Copy link

k0s-bot commented Oct 27, 2023

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

Please cherry-pick the changes locally.

git fetch origin release-1.26
git worktree add -d .worktree/backport-3650-to-release-1.26 origin/release-1.26
cd .worktree/backport-3650-to-release-1.26
git checkout -b backport-3650-to-release-1.26
ancref=$(git merge-base 418194f5975a263d7d0318b9639be95593294fa8 fd2c80e2f58b84d9143bd6736709e273ac947dd2)
git cherry-pick -x $ancref..fd2c80e2f58b84d9143bd6736709e273ac947dd2

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

Successfully merging this pull request may close these issues.

4 participants