github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82223 from rikatz/issue77493

Browse Source 
Check first if ipvs module is builtin
This commit is contained in:
Kubernetes Prow Robot 2020-01-17 03:52:56 -08:00 committed by GitHub
commit 6278df2a97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/proxy/ipvs/proxier.go
View File

@ -598,11 +598,24 @@ func (handle *LinuxKernelHandler) GetModules() ([]string, error) {
var bmods []string var bmods []string
// Find out loaded kernel modules. If this is a full static kernel it will thrown an error // Find out loaded kernel modules. If this is a full static kernel it will try to verify if the module is compiled using /boot/config-KERNELVERSION
modulesFile, err := os.Open("/proc/modules") modulesFile, err := os.Open("/proc/modules")
if err == os.ErrNotExist {
klog.Warningf("Failed to read file /proc/modules with error %v. Assuming this is a kernel without loadable modules support enabled", err)
kernelConfigFile := fmt.Sprintf("/boot/config-%s", kernelVersionStr)
kConfig, err := ioutil.ReadFile(kernelConfigFile)
if err != nil { if err != nil {
klog.Warningf("Failed to read file /proc/modules with error %v. Kube-proxy requires loadable modules support enabled in the kernel", err) return nil, fmt.Errorf("Failed to read Kernel Config file %s with error %v", kernelConfigFile, err)
return nil, err }
for _, module := range ipvsModules {
if match, _ := regexp.Match("CONFIG_"+strings.ToUpper(module)+"=y", kConfig); match {
bmods = append(bmods, module)
}
}
return bmods, nil
}
if err != nil {
return nil, fmt.Errorf("Failed to read file /proc/modules with error %v", err)
} }
mods, err := getFirstColumn(modulesFile) mods, err := getFirstColumn(modulesFile)