Pārlūkot izejas kodu

Merge pull request #1489 from mrjana/lb

Do not add names to ingress network
Alessandro Boch 8 gadi atpakaļ
vecāks
revīzija
11b0e69fcd
1 mainītis faili ar 12 papildinājumiem un 0 dzēšanām
  1. 12 0
      libnetwork/network.go

+ 12 - 0
libnetwork/network.go

@@ -1059,6 +1059,12 @@ func delNameToIP(svcMap map[string][]net.IP, name string, epIP net.IP) {
 }
 }
 
 
 func (n *network) addSvcRecords(name string, epIP net.IP, epIPv6 net.IP, ipMapUpdate bool) {
 func (n *network) addSvcRecords(name string, epIP net.IP, epIPv6 net.IP, ipMapUpdate bool) {
+	// Do not add service names for ingress network as this is a
+	// routing only network
+	if n.ingress {
+		return
+	}
+
 	c := n.getController()
 	c := n.getController()
 	c.Lock()
 	c.Lock()
 	defer c.Unlock()
 	defer c.Unlock()
@@ -1086,6 +1092,12 @@ func (n *network) addSvcRecords(name string, epIP net.IP, epIPv6 net.IP, ipMapUp
 }
 }
 
 
 func (n *network) deleteSvcRecords(name string, epIP net.IP, epIPv6 net.IP, ipMapUpdate bool) {
 func (n *network) deleteSvcRecords(name string, epIP net.IP, epIPv6 net.IP, ipMapUpdate bool) {
+	// Do not delete service names from ingress network as this is a
+	// routing only network
+	if n.ingress {
+		return
+	}
+
 	c := n.getController()
 	c := n.getController()
 	c.Lock()
 	c.Lock()
 	defer c.Unlock()
 	defer c.Unlock()