Update namespace.go

Author: andrewlee1089

pkg/controller/namespace.go

@@ -139,12 +139,14 @@ func (c *Controller) handleAddNamespace(key string) error {
 		// check if subnet is in custom vpc with configured defaultSubnet, then annotate the namespace with this subnet
 		if s.Spec.Vpc != "" && s.Spec.Vpc != c.config.ClusterRouter {
 			vpc, err := c.vpcsLister.Get(s.Spec.Vpc)
-			if err == errors.IsNotFound(err) {
-				klog.Errorf("custom vpc is not found - %v", err)
-				// this subnet is broken (it references a non-existent VPC) - we just ignore it.
-				break
-			} else if err != nil {
-				klog.Errorf("failed to get custom vpc %v", err)
+			if err != nil {
+				if errors.IsNotFound(err) {
+					// this subnet is broken (it references a non-existent VPC) - we just ignore it.
+					klog.Errorf("vpc %q is not found. Ignoring subnet %q: %v", s.Spec.Vpc, s.Name, err)
+					break
+					return nil
+				}
+				klog.Errorf("failed to get vpc %q: %v", s.Spec.Vpc, err)
 				return err
 			}
 			if s.Name == vpc.Spec.DefaultSubnet {