Skip to content
This repository was archived by the owner on Aug 20, 2025. It is now read-only.

provision: add patch to fix cpumask regression breaking kubelet#284

Merged
tklauser merged 1 commit intomasterfrom
pr/tklauser/patch-kernel-next-build
Oct 5, 2021
Merged

provision: add patch to fix cpumask regression breaking kubelet#284
tklauser merged 1 commit intomasterfrom
pr/tklauser/patch-kernel-next-build

Conversation

@tklauser
Copy link
Copy Markdown
Member

@tklauser tklauser commented Oct 4, 2021

Add a patch [1] to the bpf-next kernel build which fixes a regression
which causes kubelet to error out on startup.

See [2] and following comments for details.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c86a2d9058c5a4a05d20ef89e699b7a6b2c89da6
[2] cilium/cilium#17394 (comment)

Suggested-by: Daniel Borkmann daniel@iogearbox.net
Signed-off-by: Tobias Klauser tobias@cilium.io

@tklauser tklauser requested a review from a team as a code owner October 4, 2021 14:12
@tklauser tklauser requested review from nebril and removed request for a team October 4, 2021 14:12
@tklauser
Copy link
Copy Markdown
Member Author

tklauser commented Oct 4, 2021

build-netnext

Copy link
Copy Markdown
Contributor

@twpayne twpayne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. We could consider making the process of applying patches a bit more generic (rather than using the one-off application of a single patch here), but based on YAGNI we should only do that if we do actually need it. Hopefully this fix is temporary and can be removed soon.

@tklauser
Copy link
Copy Markdown
Member Author

tklauser commented Oct 4, 2021

LGTM. We could consider making the process of applying patches a bit more generic (rather than using the one-off application of a single patch here), but based on YAGNI we should only do that if we do actually need it. Hopefully this fix is temporary and can be removed soon.

I was considering making this more generic, but in practice we hopefully won't need to keep manual kernel patches for long. So I figured it's probably not worth investing too much time. In case this comes up again we could still reconsider an make this a bit more generic.

@tklauser tklauser force-pushed the pr/tklauser/patch-kernel-next-build branch from 8427266 to c8db715 Compare October 4, 2021 14:26
@tklauser
Copy link
Copy Markdown
Member Author

tklauser commented Oct 4, 2021

build-netnext

(fixed syntax error in cilium-ubuntu-next.json, luckly before the build was actually running 😅)

Copy link
Copy Markdown
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

(fixed syntax error in cilium-ubuntu-next.json, luckly before the build was actually running sweat_smile)

FYI, scheduling a new Jenkins build cancelled the previous one anyway :-)

Comment thread provision/ubuntu/kernel-next.sh Outdated
Add a patch [1] to the bpf-next kernel build which fixes a regression
which causes kubelet to error out on startup.

See [2] and following comments for details.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c86a2d9058c5a4a05d20ef89e699b7a6b2c89da6
[2] cilium/cilium#17394 (comment)

Suggested-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
@tklauser tklauser force-pushed the pr/tklauser/patch-kernel-next-build branch from c8db715 to c6221d4 Compare October 4, 2021 20:33
@tklauser
Copy link
Copy Markdown
Member Author

tklauser commented Oct 4, 2021

build-netnext

@tklauser tklauser merged commit f7383a5 into master Oct 5, 2021
@tklauser tklauser deleted the pr/tklauser/patch-kernel-next-build branch October 5, 2021 06:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants