delete append externalIds process in initIPAM (#3134)

kubeovn · Aug 28, 2023 · b9b8c78 · b9b8c78
1 parent ca061d5
commit b9b8c78
Showing 1 changed file with 0 additions and 36 deletions.
diff --git a/pkg/controller/init.go b/pkg/controller/init.go
@@ -316,15 +316,6 @@ func (c *Controller) InitIPAM() error {
 		}
 	}
 
-	result, err := c.ovnLegacyClient.CustomFindEntity("logical_switch_port", []string{"name"}, `external-ids:vendor{<}""`)
-	if err != nil {
-		klog.Errorf("failed to find logical switch port without external-ids:vendor: %v", err)
-	}
-	lspWithoutVendor := make(map[string]struct{}, len(result))
-	for _, lsp := range result {
-		lspWithoutVendor[lsp["name"][0]] = struct{}{}
-	}
-
 	pods, err := c.podsLister.List(labels.Everything())
 	if err != nil {
 		klog.Errorf("failed to list pods: %v", err)
@@ -392,12 +383,6 @@ func (c *Controller) InitIPAM() error {
 						klog.Errorf("failed to create/update ips CR %s.%s with ip address %s: %v", podName, pod.Namespace, ip, err)
 					}
 				}
-
-				if _, ok := lspWithoutVendor[portName]; ok {
-					if err = c.initAppendLspExternalIds(portName, pod); err != nil {
-						klog.Errorf("failed to append external-ids for logical switch port %s: %v", portName, err)
-					}
-				}
 				// Append ExternalIds is added in v1.7, used for upgrading from v1.6.3. It should be deleted now since v1.7 is not used anymore.
 			}
 		}
@@ -421,12 +406,6 @@ func (c *Controller) InitIPAM() error {
 			if v4IP != "" && v6IP != "" {
 				node.Annotations[util.IpAddressAnnotation] = util.GetStringIP(v4IP, v6IP)
 			}
-
-			if _, ok := lspWithoutVendor[portName]; ok {
-				if err = c.initAppendLspExternalIds(portName, nil); err != nil {
-					klog.Errorf("failed to append external-ids for logical switch port %s: %v", portName, err)
-				}
-			}
 		}
 	}
 
@@ -703,21 +682,6 @@ func (c *Controller) initNodeRoutes() error {
 	return nil
 }
 
-func (c *Controller) initAppendLspExternalIds(portName string, pod *v1.Pod) error {
-	externalIDs := make(map[string]string, 2)
-	externalIDs["vendor"] = util.CniTypeName
-	if pod != nil {
-		externalIDs["pod"] = fmt.Sprintf("%s/%s", pod.Namespace, pod.Name)
-	}
-
-	if err := c.ovnLegacyClient.SetLspExternalIds(portName, externalIDs); err != nil {
-		klog.Errorf("failed to set lsp external_ids for port %s: %v", portName, err)
-		return err
-	}
-
-	return nil
-}
-
 // InitHtbQos init high/medium/low qos crd
 func (c *Controller) initHtbQos() error {
 	var err error