This repository was archived by the owner on May 30, 2023. It is now read-only.
sys-kernel: remove blank kernel module nf-conntrack-ipv4#649
Merged
dongsupark merged 1 commit intomainfrom Oct 15, 2020
Merged
Conversation
Contributor
|
Since the kola Kubernetes tests run only on GCE I rebuild the vm-matrix job with that image format. Edit: kola gce here |
pothos
reviewed
Oct 15, 2020
|
|
||
| EAPI=5 | ||
| COREOS_SOURCE_REVISION="" | ||
| COREOS_SOURCE_REVISION="-r1" |
Contributor
There was a problem hiding this comment.
I think it's ok to leave the package version at the same revision that it doesn't conflict with #647
Contributor
Author
There was a problem hiding this comment.
Removed the revision changes.
Contributor
There was a problem hiding this comment.
It anyway conflicts, no idea why, but at least we tried 😄
Contributor
Author
There was a problem hiding this comment.
Interesting. Manual rebase works just well.
I simply pushed a new rebase to #647
pothos
approved these changes
Oct 15, 2020
So far Flatcar has kept a third-party patch to add a blank kernel module `nf-conntrack-ipv4.ko` to avoid regression around Kubernetes. The issue was that kube-proxy with ipvs started using `nf-conntrack.ko`, which does not exist in Kernel < 4.19. The patch was originally added by a24dbb6. However, Kubernetes 1.13 or newer already deals with the issue. It automatically loads a different Kernel module according to Kernel versions: `nf-conntrack-ipv4` for Kernel < 4.19, and `nf-conntrack` for Kernel >= 4.19. See kubernetes/kubernetes@4b90559 . We can simply remove the Kernel module, as since then all production systems have updated Kubernetes to the newer versions than 1.13.
f32195e to
4a51977
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
So far Flatcar has kept a third-party patch to add a blank kernel module
nf-conntrack-ipv4.koto avoid regression around Kubernetes.The issue was that kube-proxy with ipvs started using
nf-conntrack.ko, which does not exist in Kernel < 4.19.The patch was originally added by a24dbb6.
However, Kubernetes 1.13 or newer already deals with the issue.
It automatically loads a different Kernel module according to Kernel versions:
nf-conntrack-ipv4for Kernel < 4.19, andnf-conntrackfor Kernel >= 4.19.See kubernetes/kubernetes@4b90559 .
We can simply remove the Kernel module, as since then all production systems have updated Kubernetes to the newer versions than 1.13.
How to use
Testing done
CI passed.