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

Merge pull request #81292 from ethan-daocloud/patch-8

Browse Source 
cleanup: proxier.go error message fix
This commit is contained in:
Kubernetes Prow Robot 2019-08-12 15:00:03 -07:00 committed by GitHub
commit 387efce77f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -499,7 +499,7 @@ func (handle *LinuxKernelHandler) GetModules() ([]string, error) {
} }
kernelVersion, err := version.ParseGeneric(kernelVersionStr) kernelVersion, err := version.ParseGeneric(kernelVersionStr)
if err != nil { if err != nil {
return nil, fmt.Errorf("error parseing kernel version %q: %v", kernelVersionStr, err) return nil, fmt.Errorf("error parsing kernel version %q: %v", kernelVersionStr, err)
} }
ipvsModules := utilipvs.GetRequiredIPVSModules(kernelVersion) ipvsModules := utilipvs.GetRequiredIPVSModules(kernelVersion)
@ -586,7 +586,7 @@ func CanUseIPVSProxier(handle KernelHandler, ipsetver IPSetVersioner) (bool, err
} }
kernelVersion, err := version.ParseGeneric(kernelVersionStr) kernelVersion, err := version.ParseGeneric(kernelVersionStr)
if err != nil { if err != nil {
return false, fmt.Errorf("error parseing kernel version %q: %v", kernelVersionStr, err) return false, fmt.Errorf("error parsing kernel version %q: %v", kernelVersionStr, err)
} }
mods = utilipvs.GetRequiredIPVSModules(kernelVersion) mods = utilipvs.GetRequiredIPVSModules(kernelVersion)
wantModules := sets.NewString() wantModules := sets.NewString()
@ -1624,7 +1624,7 @@ func (proxier *Proxier) deleteEndpointConnections(connectionMap []proxy.ServiceE
for _, lbIP := range svcInfo.LoadBalancerIPStrings() { for _, lbIP := range svcInfo.LoadBalancerIPStrings() {
err := conntrack.ClearEntriesForNAT(proxier.exec, lbIP, endpointIP, v1.ProtocolUDP) err := conntrack.ClearEntriesForNAT(proxier.exec, lbIP, endpointIP, v1.ProtocolUDP)
if err != nil { if err != nil {
klog.Errorf("Failed to delete %s endpoint connections for LoabBalancerIP %s, error: %v", epSvcPair.ServicePortName.String(), lbIP, err) klog.Errorf("Failed to delete %s endpoint connections for LoadBalancerIP %s, error: %v", epSvcPair.ServicePortName.String(), lbIP, err)
} }
} }
} }