Remove the VPC while removing the default subnet

kubeovn · Nov 4, 2020 · 7a0e28b · 7a0e28b
1 parent 99217ce
commit 7a0e28b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -580,6 +580,12 @@ func (c *Controller) handleDeleteSubnet(key string) error {
 			// The default VPC subnet should be removed last
 			return fmt.Errorf("the default VPC subnet should be removed last")
 		}
+
+		err = c.deleteCustomVpc(vpc.Name)
+		if err != nil {
+			klog.Errorf("failed to delete vpc %v", err)
+			return err
+		}
 	}
 
 	c.ipam.DeleteSubnet(key)

diff --git a/pkg/controller/vpc.go b/pkg/controller/vpc.go
@@ -51,6 +51,7 @@ func (c *Controller) deleteCustomVpc(name string) error {
 		klog.Errorf("delete router failed %v", err)
 		return err
 	}
+	c.vpcs.Delete(vpc.Name)
 	return nil
 }