github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88573 from davidstack/master

Browse Source 
the result value of functrion NodeIPS will contain the docker0 ip , update the comment
This commit is contained in:
Kubernetes Prow Robot 2020-06-30 00:01:59 -07:00 committed by GitHub
commit 8a76c27b8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/proxy/ipvs/netlink_linux.go
View File

@ -135,7 +135,7 @@ func (h *netlinkHandle) ListBindAddress(devName string) ([]string, error) {
// 172.17.0.1 dev docker0 scope host src 172.17.0.1 // 172.17.0.1 dev docker0 scope host src 172.17.0.1
// 192.168.122.1 dev virbr0 scope host src 192.168.122.1 // 192.168.122.1 dev virbr0 scope host src 192.168.122.1
// Then cut the unique src IP fields, // Then cut the unique src IP fields,
// --> result set: [10.0.0.1, 10.0.0.10, 10.0.0.252, 100.106.89.164, 127.0.0.1, 192.168.122.1] // --> result set: [10.0.0.1, 10.0.0.10, 10.0.0.252, 100.106.89.164, 127.0.0.1, 172.17.0.1, 192.168.122.1]
// If dev is specified, it's equivalent to exec: // If dev is specified, it's equivalent to exec:
// $ ip route show table local type local proto kernel dev kube-ipvs0 // $ ip route show table local type local proto kernel dev kube-ipvs0

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

@ -286,7 +286,7 @@ type realIPGetter struct {
// 172.17.0.1 dev docker0 scope host src 172.17.0.1 // 172.17.0.1 dev docker0 scope host src 172.17.0.1
// 192.168.122.1 dev virbr0 scope host src 192.168.122.1 // 192.168.122.1 dev virbr0 scope host src 192.168.122.1
// Then filter out dev==kube-ipvs0, and cut the unique src IP fields, // Then filter out dev==kube-ipvs0, and cut the unique src IP fields,
// Node IP set: [100.106.89.164, 127.0.0.1, 192.168.122.1] // Node IP set: [100.106.89.164, 127.0.0.1, 172.17.0.1, 192.168.122.1]
func (r *realIPGetter) NodeIPs() (ips []net.IP, err error) { func (r *realIPGetter) NodeIPs() (ips []net.IP, err error) {
// Pass in empty filter device name for list all LOCAL type addresses. // Pass in empty filter device name for list all LOCAL type addresses.
nodeAddress, err := r.nl.GetLocalAddresses("", DefaultDummyDevice) nodeAddress, err := r.nl.GetLocalAddresses("", DefaultDummyDevice)