chore: rebase and fix conflict with flannel-io#1539

ttys3 · Feb 26, 2022 · 7caa6ac · 7caa6ac
1 parent 8302f87
commit 7caa6ac
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/ipmatch/match.go b/pkg/ipmatch/match.go
@@ -260,7 +260,7 @@ func LookupExtIface(ifname string, ifregexS string, ipStack int, opts PublicIPOp
 		log.Infof("Using %s as external address", extAddr)
 	}
 
-	if extAddr == nil {
+	if extAddr == nil && ipStack != ipv6Stack {
 		log.Infof("Defaulting external address to interface address (%s)", ifaceAddr)
 		extAddr = ifaceAddr
 	}
@@ -273,7 +273,7 @@ func LookupExtIface(ifname string, ifregexS string, ipStack int, opts PublicIPOp
 		log.Infof("Using %s as external address", extV6Addr)
 	}
 
-	if extV6Addr == nil {
+	if extV6Addr == nil && ipStack != ipv4Stack {
 		log.Infof("Defaulting external v6 address to interface address (%s)", ifaceV6Addr)
 		extV6Addr = ifaceV6Addr
 	}