github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

proxy utils: GetNodeAddresses should check if matching addresses were found

Browse Source 
Signed-off-by: Andrew Sy Kim <kim.andrewsy@gmail.com>
This commit is contained in:
Andrew Sy Kim 2020-05-26 12:12:00 -04:00
parent a99321c87c
commit f96d35fc11
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/proxy/util/utils.go
View File

@ -221,6 +221,11 @@ func GetNodeAddresses(cidrs []string, nw NetworkInterfacer) (sets.String, error)
} }
} }
} }
if uniqueAddressList.Len() == 0 {
return nil, fmt.Errorf("no addresses found for cidrs %v", cidrs)
}
return uniqueAddressList, nil return uniqueAddressList, nil
} }

8
pkg/proxy/util/utils_test.go
View File

@ -18,6 +18,7 @@ package util
import ( import (
"context" "context"
"fmt"
"net" "net"
"reflect" "reflect"
"testing" "testing"
@ -260,6 +261,7 @@ func TestGetNodeAddressses(t *testing.T) {
nw *fake.FakeNetwork nw *fake.FakeNetwork
itfAddrsPairs []InterfaceAddrsPair itfAddrsPairs []InterfaceAddrsPair
expected sets.String expected sets.String
expectedErr error
}{ }{
{ // case 0 { // case 0
cidrs: []string{"10.20.30.0/24"}, cidrs: []string{"10.20.30.0/24"},
@ -375,7 +377,8 @@ func TestGetNodeAddressses(t *testing.T) {
addrs: []net.Addr{fake.AddrStruct{Val: "127.0.0.1/8"}}, addrs: []net.Addr{fake.AddrStruct{Val: "127.0.0.1/8"}},
}, },
}, },
expected: sets.NewString(), expected: nil,
expectedErr: fmt.Errorf("no addresses found for cidrs %v", []string{"10.20.30.0/24", "100.200.201.0/24"}),
}, },
{ // case 8 { // case 8
cidrs: []string{}, cidrs: []string{},
@ -455,9 +458,10 @@ func TestGetNodeAddressses(t *testing.T) {
testCases[i].nw.AddInterfaceAddr(&pair.itf, pair.addrs) testCases[i].nw.AddInterfaceAddr(&pair.itf, pair.addrs)
} }
addrList, err := GetNodeAddresses(testCases[i].cidrs, testCases[i].nw) addrList, err := GetNodeAddresses(testCases[i].cidrs, testCases[i].nw)
if err != nil { if !reflect.DeepEqual(err, testCases[i].expectedErr) {
t.Errorf("case [%d], unexpected error: %v", i, err) t.Errorf("case [%d], unexpected error: %v", i, err)
} }
if !addrList.Equal(testCases[i].expected) { if !addrList.Equal(testCases[i].expected) {
t.Errorf("case [%d], unexpected mismatch, expected: %v, got: %v", i, testCases[i].expected, addrList) t.Errorf("case [%d], unexpected mismatch, expected: %v, got: %v", i, testCases[i].expected, addrList)
} }