Skip to content

Commit

Permalink
Merge pull request #18819 from openshift-cherrypick-robot/cherry-pick…
Browse files Browse the repository at this point in the history
…-18801-to-release-3.9

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
  • Loading branch information
openshift-merge-robot authored Mar 6, 2018
2 parents c70dd8d + 9b2e5ed commit 2ca7a16
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/network/master/subnets.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit 2ca7a16

Please sign in to comment.