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

1.20.x: kernel updates, statically linked modprobe #3997

Merged
merged 5 commits into from
May 28, 2024

Conversation

larvacea
Copy link
Member

Description of changes:

Testing done:

Kernel changes: our standard sonobuoy tests and manual inspection of patch and configuration changes.
modprobe: see [#3981] for details.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

larvacea and others added 4 commits May 28, 2024 18:43
Rebase to Amazon Linux upstream version 5.10.216-204.855.amzn2.

Signed-off-by: Martin Harriman <[email protected]>
(cherry picked from commit 1c966f3)
Rebase to Amazon Linux upstream version 5.15.158-103.164.amzn2.

Signed-off-by: Martin Harriman <[email protected]>
(cherry picked from commit 1053dde)
Rebase to Amazon Linux upstream version 6.1.90-99.173.amzn2023.

Signed-off-by: Martin Harriman <[email protected]>
(cherry picked from commit 22fa7f3)
By providing a statically linked kmod, containers can mount it
and load kernel modules without compatibility issues

(cherry picked from commit 6ac0fd4)
CHANGELOG.md Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md for the four commits (3 kernel, one modprobe).
Release.toml: bump patch level to 1.20.1
@larvacea
Copy link
Member Author

I have incorporated @ginglis13's suggested changes.

@larvacea larvacea requested a review from ginglis13 May 28, 2024 21:30
@larvacea larvacea merged commit da47788 into bottlerocket-os:1.20.x May 28, 2024
@larvacea larvacea deleted the 1.20.x branch May 28, 2024 21:49
@larvacea larvacea restored the 1.20.x branch May 28, 2024 21:52
@obirhuppertz
Copy link

Would it be possible to publish a 1.20.1 release with just these changes so we can select this AMI in our launch template? Reading through the merged issues, cilium should be working again with these commits.

Thanks @vigh-m (and any unmentioned contributor) for investigating and fixing this issue!

@yeazelm
Copy link
Contributor

yeazelm commented Jun 14, 2024

Hello @obirhuppertz, we did release 1.20.2 which provides a fix for CIlium. Please check that release and follow up on #3968 if you experience more issues with Cilium. Thanks!

@obirhuppertz
Copy link

@yeazelm @vigh-m can confirm cilium is still working on 1.20.2 bottlerocket nodes having the workaround via extraMounts and volumes removed in values.yaml. For me the issue is fixed now. Great work! 🥳

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.

5 participants