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
e2409a05
Commit
e2409a05
authored
Nov 14, 2018
by
Lars Ekman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes NodePort in ipv6 with proxy-mode=ipvs. #68437
Use ipv6 addresses for NodePort with proxy-mode=ipvs in a ipv6-only cluster.
parent
a44c2b9e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
netlink_linux.go
pkg/proxy/ipvs/netlink_linux.go
+8
-3
proxier.go
pkg/proxy/ipvs/proxier.go
+3
-3
No files found.
pkg/proxy/ipvs/netlink_linux.go
View file @
e2409a05
...
...
@@ -30,11 +30,12 @@ import (
type
netlinkHandle
struct
{
netlink
.
Handle
ipv6
bool
}
// NewNetLinkHandle will crate a new NetLinkHandle
func
NewNetLinkHandle
()
NetLinkHandle
{
return
&
netlinkHandle
{
netlink
.
Handle
{}}
func
NewNetLinkHandle
(
ipv6
bool
)
NetLinkHandle
{
return
&
netlinkHandle
{
netlink
.
Handle
{}
,
ipv6
}
}
// EnsureAddressBind checks if address is bound to the interface and, if not, binds it. If the address is already bound, return true.
...
...
@@ -181,7 +182,11 @@ func (h *netlinkHandle) GetLocalAddresses(dev, filterDev string) (sets.String, e
if
route
.
LinkIndex
==
filterLinkIndex
{
continue
}
if
route
.
Src
!=
nil
{
if
h
.
ipv6
{
if
route
.
Dst
.
IP
.
To4
()
==
nil
&&
!
route
.
Dst
.
IP
.
IsLinkLocalUnicast
()
{
res
.
Insert
(
route
.
Dst
.
IP
.
String
())
}
}
else
if
route
.
Src
!=
nil
{
res
.
Insert
(
route
.
Src
.
String
())
}
}
...
...
pkg/proxy/ipvs/proxier.go
View file @
e2409a05
...
...
@@ -382,14 +382,14 @@ func NewProxier(ipt utiliptables.Interface,
healthzServer
:
healthzServer
,
ipvs
:
ipvs
,
ipvsScheduler
:
scheduler
,
ipGetter
:
&
realIPGetter
{
nl
:
NewNetLinkHandle
()},
ipGetter
:
&
realIPGetter
{
nl
:
NewNetLinkHandle
(
nodeIP
.
To4
()
==
nil
)},
iptablesData
:
bytes
.
NewBuffer
(
nil
),
filterChainsData
:
bytes
.
NewBuffer
(
nil
),
natChains
:
bytes
.
NewBuffer
(
nil
),
natRules
:
bytes
.
NewBuffer
(
nil
),
filterChains
:
bytes
.
NewBuffer
(
nil
),
filterRules
:
bytes
.
NewBuffer
(
nil
),
netlinkHandle
:
NewNetLinkHandle
(),
netlinkHandle
:
NewNetLinkHandle
(
nodeIP
.
To4
()
==
nil
),
ipset
:
ipset
,
nodePortAddresses
:
nodePortAddresses
,
networkInterfacer
:
utilproxy
.
RealNetwork
{},
...
...
@@ -576,7 +576,7 @@ func CleanupLeftovers(ipvs utilipvs.Interface, ipt utiliptables.Interface, ipset
}
}
// Delete dummy interface created by ipvs Proxier.
nl
:=
NewNetLinkHandle
()
nl
:=
NewNetLinkHandle
(
false
)
err
:=
nl
.
DeleteDummyDevice
(
DefaultDummyDevice
)
if
err
!=
nil
{
klog
.
Errorf
(
"Error deleting dummy device %s created by IPVS proxier: %v"
,
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