Merge pull request #18819 from openshift-cherrypick-robot/cherry-pick-18801-to-release-3.9

openshift-merge-robot · web-flow · commit 2ca7a16ce27f · 2018-03-05T22:58:24.000-08:00
Automatic merge from submit-queue. [release-3.9] Fix handleDeleteSubnet() to release network from subnet allocator This is an automated cherry-pick of #18801 /assign pravisankar
diff --git a/pkg/network/master/subnets.go b/pkg/network/master/subnets.go
@@ -334,7 +334,7 @@ func (master *OsdnMaster) handleDeleteSubnet(obj interface{}) {
 	hs := obj.(*networkapi.HostSubnet)
 	glog.V(5).Infof("Watch %s event for HostSubnet %q", watch.Deleted, hs.Name)
 
-	if _, ok := hs.Annotations[networkapi.AssignHostSubnetAnnotation]; !ok {
+	if _, ok := hs.Annotations[networkapi.AssignHostSubnetAnnotation]; ok {
 		return
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ func (master *OsdnMaster) handleDeleteSubnet(obj interface{}) {`
`334`	`334`	`hs := obj.(*networkapi.HostSubnet)`
`335`	`335`	`glog.V(5).Infof("Watch %s event for HostSubnet %q", watch.Deleted, hs.Name)`
`336`	`336`
`337`		`- if _, ok := hs.Annotations[networkapi.AssignHostSubnetAnnotation]; !ok {`
	`337`	`+ if _, ok := hs.Annotations[networkapi.AssignHostSubnetAnnotation]; ok {`
`338`	`338`	`return`
`339`	`339`	`}`
`340`	`340`