mirror of https://github.com/k3s-io/k3s
Merge pull request #66739 from islinwb/ipvs_mods_check
Automatic merge from submit-queue (batch tested with PRs 66489, 66728, 66739). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. remove incomplete check of ipvs modules in hack/local-up-cluster.sh **What this PR does / why we need it**: Currently `hack/local-up-cluster.sh` executes `sudo modprobe -a ip_vs ip_vs_rr ip_vs_wrr ip_vs_sh nf_conntrack_ipv4` to check whether the ipvs required modules exist, which leaves out the scenario https://github.com/kubernetes/kubernetes/issues/63801 mentioned. Since `func CanUseIPVSProxier` in `pkg/proxy/ipvs/proxier.go` covers all scenarios, maybe we should just remove this part instead of adding codes. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```pull/8/head
commit
24fa5edb60
|
@ -126,16 +126,6 @@ if [ "${CLOUD_PROVIDER}" == "openstack" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
# load required kernel modules if proxy mode is set to "ipvs".
|
||||
if [ "${KUBE_PROXY_MODE}" == "ipvs" ]; then
|
||||
# If required kernel modules are not available, fall back to iptables.
|
||||
sudo modprobe -a ip_vs ip_vs_rr ip_vs_wrr ip_vs_sh nf_conntrack_ipv4
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Required kernel modules for ipvs not found. Falling back to iptables mode."
|
||||
KUBE_PROXY_MODE=iptables
|
||||
fi
|
||||
fi
|
||||
|
||||
# set feature gates if enable Pod priority and preemption
|
||||
if [ "${ENABLE_POD_PRIORITY_PREEMPTION}" == true ]; then
|
||||
FEATURE_GATES="$FEATURE_GATES,PodPriority=true"
|
||||
|
|
Loading…
Reference in New Issue