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] Fix helm race condition #3649

Merged
merged 3 commits into from
Oct 26, 2023

Conversation

k0s-bot
Copy link

@k0s-bot k0s-bot commented Oct 26, 2023

Automated backport to release-1.28, triggered by a label in #3633.
See #3282 #3433.

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)
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)
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)
@k0s-bot k0s-bot requested a review from a team as a code owner October 26, 2023 14:07
@k0s-bot k0s-bot requested review from twz123 and jnummelin October 26, 2023 14:07
@k0s-bot k0s-bot mentioned this pull request Oct 26, 2023
16 tasks
@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 Oct 26, 2023
@twz123 twz123 merged commit eec2c37 into release-1.28 Oct 26, 2023
71 checks passed
@twz123 twz123 deleted the backport-3633-to-release-1.28 branch October 26, 2023 15:23
@k0s-bot
Copy link
Author

k0s-bot commented Oct 26, 2023

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-3649-to-release-1.27 origin/release-1.27
cd .worktree/backport-3649-to-release-1.27
git checkout -b backport-3649-to-release-1.27
ancref=$(git merge-base 127c6aa587317e00dfcb24364dc5a48679dbbe12 15c1c93b3cab64a563af678618b8ddc6a6881395)
git cherry-pick -x $ancref..15c1c93b3cab64a563af678618b8ddc6a6881395

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