Skip to content

Commit

Permalink
fix u2o infinity recycle (#3567)
Browse files Browse the repository at this point in the history
* fix u2o infinity recycle

Signed-off-by: Changlu Yi <clyi@alauda.io>

* fix

Signed-off-by: changluyi <clyi@alauda.io>

---------

Signed-off-by: Changlu Yi <clyi@alauda.io>
Signed-off-by: changluyi <clyi@alauda.io>
  • Loading branch information
changluyi committed Dec 23, 2023
1 parent ad3e369 commit 9d4ea55
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkg/controller/subnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func (c *Controller) enqueueUpdateSubnet(old, new interface{}) {
usingIPs = newSubnet.Status.V4UsingIPs
}
u2oInterconnIP := newSubnet.Status.U2OInterconnectionIP
if !newSubnet.DeletionTimestamp.IsZero() && usingIPs == 0 || (usingIPs == 1 && u2oInterconnIP != "") {
if !newSubnet.DeletionTimestamp.IsZero() && (usingIPs == 0 || (usingIPs == 1 && u2oInterconnIP != "")) {
c.addOrUpdateSubnetQueue.Add(key)
return
}
Expand All @@ -94,6 +94,7 @@ func (c *Controller) enqueueUpdateSubnet(old, new interface{}) {
oldSubnet.Spec.IPv6RAConfigs != newSubnet.Spec.IPv6RAConfigs ||
oldSubnet.Spec.Protocol != newSubnet.Spec.Protocol ||
!reflect.DeepEqual(oldSubnet.Spec.Acls, newSubnet.Spec.Acls) ||
oldSubnet.Spec.Vpc != newSubnet.Spec.Vpc ||
oldSubnet.Spec.U2OInterconnection != newSubnet.Spec.U2OInterconnection ||
(newSubnet.Spec.U2OInterconnection && newSubnet.Spec.U2OInterconnectionIP != "" &&
oldSubnet.Spec.U2OInterconnectionIP != newSubnet.Spec.U2OInterconnectionIP) {
Expand Down

0 comments on commit 9d4ea55

Please sign in to comment.