reuse logical_switch namespace annotation instead introducing a new one

Signed-off-by: Karol Szwaj <[email protected]>

pkg/controller/namespace.go

@@ -128,7 +128,7 @@ func (c *Controller) handleAddNamespace(key string) error {
 	}
 	namespace := cachedNs.DeepCopy()
 
-	var ls, ds, ippool string
+	var ls, ippool string
 	var lss, cidrs, excludeIps []string
 	subnets, err := c.subnetsLister.List(labels.Everything())
 	if err != nil {
@@ -159,7 +159,7 @@ func (c *Controller) handleAddNamespace(key string) error {
 				return err
 			}
 			if s.Name == vpc.Spec.DefaultSubnet {
-				ds = s.Name
+				lss = []string{s.Name}
 			}
 		}
 	}
@@ -214,9 +214,6 @@ func (c *Controller) handleAddNamespace(key string) error {
 		return nil
 	}
 
-	if ds != "" {
-		namespace.Annotations[util.DefaultSubnetAnnotation] = ds
-	}
 	namespace.Annotations[util.LogicalSwitchAnnotation] = strings.Join(lss, ",")
 	namespace.Annotations[util.CidrAnnotation] = strings.Join(cidrs, ";")
 	namespace.Annotations[util.ExcludeIpsAnnotation] = strings.Join(excludeIps, ";")

pkg/controller/pod.go

@@ -1534,14 +1534,6 @@ func (c *Controller) getPodDefaultSubnet(pod *v1.Pod) (*kubeovnv1.Subnet, error)
 			klog.Error(err)
 			return nil, err
 		}
-		if _, ok := ns.Annotations[util.DefaultSubnetAnnotation]; ok {
-			subnet, err = c.subnetsLister.Get(ns.Annotations[util.DefaultSubnetAnnotation])
-			if err != nil {
-				klog.Errorf("failed to get subnet %v", err)
-				return nil, err
-			}
-			return subnet, nil
-		}
 
 		subnetNames := ns.Annotations[util.LogicalSwitchAnnotation]
 		for _, subnetName := range strings.Split(subnetNames, ",") {

pkg/util/const.go

@@ -91,7 +91,6 @@ const (
 
 	PortNameAnnotation      = "ovn.kubernetes.io/port_name"
 	LogicalSwitchAnnotation = "ovn.kubernetes.io/logical_switch"
-	DefaultSubnetAnnotation = "ovn.kubernetes.io/default_vpc_subnet"
 
 	TunnelInterfaceAnnotation = "ovn.kubernetes.io/tunnel_interface"