Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
5c3ee0f2
Commit
5c3ee0f2
authored
Feb 02, 2018
by
m1093782566
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
check ErrorNotFound in netlink.go to fix cross build error
parent
d3b783d5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
netlink_linux.go
pkg/proxy/ipvs/netlink_linux.go
+4
-2
proxier.go
pkg/proxy/ipvs/proxier.go
+1
-3
No files found.
pkg/proxy/ipvs/netlink_linux.go
View file @
5c3ee0f2
...
@@ -57,7 +57,7 @@ func (h *netlinkHandle) EnsureAddressBind(address, devName string) (exist bool,
...
@@ -57,7 +57,7 @@ func (h *netlinkHandle) EnsureAddressBind(address, devName string) (exist bool,
return
false
,
nil
return
false
,
nil
}
}
// UnbindAddress
unbind address from the interface
// UnbindAddress
makes sure IP address is unbound from the network interface.
func
(
h
*
netlinkHandle
)
UnbindAddress
(
address
,
devName
string
)
error
{
func
(
h
*
netlinkHandle
)
UnbindAddress
(
address
,
devName
string
)
error
{
dev
,
err
:=
h
.
LinkByName
(
devName
)
dev
,
err
:=
h
.
LinkByName
(
devName
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -68,7 +68,9 @@ func (h *netlinkHandle) UnbindAddress(address, devName string) error {
...
@@ -68,7 +68,9 @@ func (h *netlinkHandle) UnbindAddress(address, devName string) error {
return
fmt
.
Errorf
(
"error parse ip address: %s"
,
address
)
return
fmt
.
Errorf
(
"error parse ip address: %s"
,
address
)
}
}
if
err
:=
h
.
AddrDel
(
dev
,
&
netlink
.
Addr
{
IPNet
:
netlink
.
NewIPNet
(
addr
)});
err
!=
nil
{
if
err
:=
h
.
AddrDel
(
dev
,
&
netlink
.
Addr
{
IPNet
:
netlink
.
NewIPNet
(
addr
)});
err
!=
nil
{
return
fmt
.
Errorf
(
"error unbind address: %s from interface: %s, err: %v"
,
address
,
devName
,
err
)
if
err
!=
unix
.
ENXIO
{
return
fmt
.
Errorf
(
"error unbind address: %s from interface: %s, err: %v"
,
address
,
devName
,
err
)
}
}
}
return
nil
return
nil
}
}
...
...
pkg/proxy/ipvs/proxier.go
View file @
5c3ee0f2
...
@@ -51,8 +51,6 @@ import (
...
@@ -51,8 +51,6 @@ import (
utilipvs
"k8s.io/kubernetes/pkg/util/ipvs"
utilipvs
"k8s.io/kubernetes/pkg/util/ipvs"
utilsysctl
"k8s.io/kubernetes/pkg/util/sysctl"
utilsysctl
"k8s.io/kubernetes/pkg/util/sysctl"
utilexec
"k8s.io/utils/exec"
utilexec
"k8s.io/utils/exec"
"golang.org/x/sys/unix"
)
)
const
(
const
(
...
@@ -1705,7 +1703,7 @@ func (proxier *Proxier) cleanLegacyService(atciveServices map[string]bool, curre
...
@@ -1705,7 +1703,7 @@ func (proxier *Proxier) cleanLegacyService(atciveServices map[string]bool, curre
for
_
,
addr
:=
range
unbindIPAddr
.
UnsortedList
()
{
for
_
,
addr
:=
range
unbindIPAddr
.
UnsortedList
()
{
err
:=
proxier
.
netlinkHandle
.
UnbindAddress
(
addr
,
DefaultDummyDevice
)
err
:=
proxier
.
netlinkHandle
.
UnbindAddress
(
addr
,
DefaultDummyDevice
)
// Ignore no such address error when try to unbind address
// Ignore no such address error when try to unbind address
if
err
!=
nil
&&
err
!=
unix
.
ENXIO
{
if
err
!=
nil
{
glog
.
Errorf
(
"Failed to unbind service addr %s from dummy interface %s: %v"
,
addr
,
DefaultDummyDevice
,
err
)
glog
.
Errorf
(
"Failed to unbind service addr %s from dummy interface %s: %v"
,
addr
,
DefaultDummyDevice
,
err
)
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment