We've seen instances of a VPC being left with a now-deleted subnet on

Andrew Lee · Andrew Lee · commit 6985ae0b6b64 · 2025-05-09T08:44:17.000Z
its status field. We believe this is due to a race condition where we patch a VPC without taking care of ResourceVersion. For now, every time we run `handleAddOrUpdateVpc` we ensure the vpc.Status.Subnets field is correct. Fixes: #5220 Signed-off-by: Andrew Lee <alee@evroc.com>
diff --git a/pkg/controller/vpc.go b/pkg/controller/vpc.go
@@ -492,6 +492,14 @@ func (c *Controller) handleAddOrUpdateVpc(key string) error {
 		}
 	}
 
+	vpcSubnets, defaultSubnet, err := c.getVpcSubnets(vpc)
+	if err != nil {
+		klog.Error(err)
+		return err
+	}
+
+	vpc.Status.Subnets = vpcSubnets
+	vpc.Status.DefaultLogicalSwitch = defaultSubnet
 	vpc.Status.Router = key
 	vpc.Status.Standby = true
 	vpc.Status.VpcPeerings = newPeers

Original file line number	Diff line number	Diff line change
`@@ -492,6 +492,14 @@ func (c *Controller) handleAddOrUpdateVpc(key string) error {`
`492`	`492`	`}`
`493`	`493`	`}`
`494`	`494`
	`495`	`+ vpcSubnets, defaultSubnet, err := c.getVpcSubnets(vpc)`
	`496`	`+ if err != nil {`
	`497`	`+ klog.Error(err)`
	`498`	`+ return err`
	`499`	`+ }`
	`500`	`+`
	`501`	`+ vpc.Status.Subnets = vpcSubnets`
	`502`	`+ vpc.Status.DefaultLogicalSwitch = defaultSubnet`
`495`	`503`	`vpc.Status.Router = key`
`496`	`504`	`vpc.Status.Standby = true`
`497`	`505`	`vpc.Status.VpcPeerings = newPeers`