Merge pull request #18393 from danwinship/delete-egressips

openshift-merge-robot · web-flow · commit 810dc7be7381 · 2018-02-02T12:37:43.000-08:00
Automatic merge from submit-queue. Drop auto-egress-IP rules when egress IP is removed from NetNamespace (Previously we were only doing it when the NetNamespace was deleted.) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1540846 (does not conflict with #18121 so it doesn't matter which merges first)
diff --git a/pkg/network/node/egressip.go b/pkg/network/node/egressip.go
@@ -247,6 +247,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
`@@ -247,6 +247,8 @@ func (eip *egressIPWatcher) handleAddOrUpdateNetNamespace(obj, _ interface{}, ev`
`247`	`247`	`glog.Warningf("Ignoring extra EgressIPs (%v) in NetNamespace %q", netns.EgressIPs[1:], netns.Name)`
`248`	`248`	`}`
`249`	`249`	`eip.updateNamespaceEgress(netns.NetID, netns.EgressIPs[0])`
	`250`	`+ } else {`
	`251`	`+ eip.deleteNamespaceEgress(netns.NetID)`
`250`	`252`	`}`
`251`	`253`	`}`
`252`	`254`