github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 05:46:16 +00:00
Code Issues Projects Releases Wiki Activity

Replace the ioutil by the os and io for the pkg/proxy/ipvs

Browse Source
This commit is contained in:
Shiming Zhang 2022-10-31 16:19:50 +08:00
parent a65d76a5b6
commit 1c8d3226a9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net" "net"
"os" "os"
"reflect" "reflect"
@ -645,7 +644,7 @@ func (handle *LinuxKernelHandler) GetModules() ([]string, error) {
if err == os.ErrNotExist { if err == os.ErrNotExist {
klog.ErrorS(err, "Failed to read file /proc/modules, assuming this is a kernel without loadable modules support enabled") klog.ErrorS(err, "Failed to read file /proc/modules, assuming this is a kernel without loadable modules support enabled")
kernelConfigFile := fmt.Sprintf("/boot/config-%s", kernelVersionStr) kernelConfigFile := fmt.Sprintf("/boot/config-%s", kernelVersionStr)
kConfig, err := ioutil.ReadFile(kernelConfigFile) kConfig, err := os.ReadFile(kernelConfigFile)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to read Kernel Config file %s with error %w", kernelConfigFile, err) return nil, fmt.Errorf("failed to read Kernel Config file %s with error %w", kernelConfigFile, err)
} }
@ -667,7 +666,7 @@ func (handle *LinuxKernelHandler) GetModules() ([]string, error) {
} }
builtinModsFilePath := fmt.Sprintf("/lib/modules/%s/modules.builtin", kernelVersionStr) builtinModsFilePath := fmt.Sprintf("/lib/modules/%s/modules.builtin", kernelVersionStr)
b, err := ioutil.ReadFile(builtinModsFilePath) b, err := os.ReadFile(builtinModsFilePath)
if err != nil { if err != nil {
klog.ErrorS(err, "Failed to read builtin modules file, you can ignore this message when kube-proxy is running inside container without mounting /lib/modules", "filePath", builtinModsFilePath) klog.ErrorS(err, "Failed to read builtin modules file, you can ignore this message when kube-proxy is running inside container without mounting /lib/modules", "filePath", builtinModsFilePath)
} }
@ -695,7 +694,7 @@ func (handle *LinuxKernelHandler) GetModules() ([]string, error) {
// getFirstColumn reads all the content from r into memory and return a // getFirstColumn reads all the content from r into memory and return a
// slice which consists of the first word from each line. // slice which consists of the first word from each line.
func getFirstColumn(r io.Reader) ([]string, error) { func getFirstColumn(r io.Reader) ([]string, error) {
b, err := ioutil.ReadAll(r) b, err := io.ReadAll(r)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -714,7 +713,7 @@ func getFirstColumn(r io.Reader) ([]string, error) {
// GetKernelVersion returns currently running kernel version. // GetKernelVersion returns currently running kernel version.
func (handle *LinuxKernelHandler) GetKernelVersion() (string, error) { func (handle *LinuxKernelHandler) GetKernelVersion() (string, error) {
kernelVersionFile := "/proc/sys/kernel/osrelease" kernelVersionFile := "/proc/sys/kernel/osrelease"
fileContent, err := ioutil.ReadFile(kernelVersionFile) fileContent, err := os.ReadFile(kernelVersionFile)
if err != nil { if err != nil {
return "", fmt.Errorf("error reading osrelease file %q: %v", kernelVersionFile, err) return "", fmt.Errorf("error reading osrelease file %q: %v", kernelVersionFile, err)
} }