Skip to content

Commit

Permalink
Merge pull request #82223 from rikatz/issue77493
Browse files Browse the repository at this point in the history
Check first if ipvs module is builtin
  • Loading branch information
k8s-ci-robot committed Jan 17, 2020
2 parents 05b6c32 + 6aaae7d commit 6278df2
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions pkg/proxy/ipvs/proxier.go
Original file line number Diff line number Diff line change
Expand Up @@ -598,11 +598,24 @@ func (handle *LinuxKernelHandler) GetModules() ([]string, error) {

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")
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 {
return nil, fmt.Errorf("Failed to read Kernel Config file %s with error %v", kernelConfigFile, 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 {
klog.Warningf("Failed to read file /proc/modules with error %v. Kube-proxy requires loadable modules support enabled in the kernel", err)
return nil, err
return nil, fmt.Errorf("Failed to read file /proc/modules with error %v", err)
}

mods, err := getFirstColumn(modulesFile)
Expand Down

0 comments on commit 6278df2

Please sign in to comment.