@@ -990,33 +990,6 @@ func (proxier *Proxier) OnNodeSynced() {
990990// EntryInvalidErr indicates if an ipset entry is invalid or not
991991const EntryInvalidErr = "error adding entry %s to ipset %s"
992992
993- func getLocalAddrs () ([]net.IP , error ) {
994- var localAddrs []net.IP
995-
996- addrs , err := net .InterfaceAddrs ()
997- if err != nil {
998- return nil , err
999- }
1000-
1001- for _ , addr := range addrs {
1002- ip , _ , err := net .ParseCIDR (addr .String ())
1003- if err != nil {
1004- return nil , err
1005- }
1006- localAddrs = append (localAddrs , ip )
1007- }
1008- return localAddrs , nil
1009- }
1010-
1011- func ipExists (ip net.IP , addrs []net.IP ) bool {
1012- for _ , addr := range addrs {
1013- if ip .Equal (addr ) {
1014- return true
1015- }
1016- }
1017- return false
1018- }
1019-
1020993// This is where all of the ipvs calls happen.
1021994// assumes proxier.mu is held
1022995func (proxier * Proxier ) syncProxyRules () {
@@ -1036,11 +1009,16 @@ func (proxier *Proxier) syncProxyRules() {
10361009 klog .V (4 ).Infof ("syncProxyRules took %v" , time .Since (start ))
10371010 }()
10381011
1039- localAddrs , err := getLocalAddrs ()
1012+ localAddrs , err := utilproxy . GetLocalAddrs ()
10401013 if err != nil {
1041- klog .Errorf ("Failed to get local addresses during proxy sync: %v" , err )
1014+ klog .Errorf ("Failed to get local addresses during proxy sync: %v, assuming external IPs are not local" , err )
1015+ } else if len (localAddrs ) == 0 {
1016+ klog .Warning ("No local addresses found, assuming all external IPs are not local" )
10421017 }
10431018
1019+ localAddrSet := utilnet.IPSet {}
1020+ localAddrSet .Insert (localAddrs ... )
1021+
10441022 // We assume that if this was called, we really want to sync them,
10451023 // even if nothing changed in the meantime. In other words, callers are
10461024 // responsible for detecting no-op changes and not calling this function.
@@ -1222,9 +1200,10 @@ func (proxier *Proxier) syncProxyRules() {
12221200
12231201 // Capture externalIPs.
12241202 for _ , externalIP := range svcInfo .ExternalIPStrings () {
1225- if len (localAddrs ) == 0 {
1226- klog .Errorf ("couldn't find any local IPs, assuming %s is not local" , externalIP )
1227- } else if (svcInfo .Protocol () != v1 .ProtocolSCTP ) && ipExists (net .ParseIP (externalIP ), localAddrs ) {
1203+ // If the "external" IP happens to be an IP that is local to this
1204+ // machine, hold the local port open so no other process can open it
1205+ // (because the socket might open but it would never work).
1206+ if localAddrSet .Len () > 0 && (svcInfo .Protocol () != v1 .ProtocolSCTP ) && localAddrSet .Has (net .ParseIP (externalIP )) {
12281207 // We do not start listening on SCTP ports, according to our agreement in the SCTP support KEP
12291208 lp := utilproxy.LocalPort {
12301209 Description : "externalIP for " + svcNameString ,
0 commit comments