Drop auto-egress-IP rules when egress IP is removed from NetNamespace

danwinship · danwinship · commit 2d8741a1be3d · 2018-02-01T12:14:58.000-05:00
(Previously we were only doing it when the NetNamespace was deleted.)
diff --git a/pkg/network/node/egressip.go b/pkg/network/node/egressip.go
@@ -198,6 +198,8 @@ func (eip *egressIPWatcher) handleAddOrUpdateNetNamespace(obj, _ interface{}, ev
 			glog.Warningf("Ignoring extra EgressIPs (%v) in NetNamespace %q", netns.EgressIPs[1:], netns.Name)
 		}
 		eip.updateNamespaceEgress(netns.NetID, netns.EgressIPs[0])
+	} else {
+		eip.deleteNamespaceEgress(netns.NetID)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,8 @@ func (eip *egressIPWatcher) handleAddOrUpdateNetNamespace(obj, _ interface{}, ev`
`198`	`198`	`glog.Warningf("Ignoring extra EgressIPs (%v) in NetNamespace %q", netns.EgressIPs[1:], netns.Name)`
`199`	`199`	`}`
`200`	`200`	`eip.updateNamespaceEgress(netns.NetID, netns.EgressIPs[0])`
	`201`	`+ } else {`
	`202`	`+ eip.deleteNamespaceEgress(netns.NetID)`
`201`	`203`	`}`
`202`	`204`	`}`
`203`	`205`