solve conflict

Signed-off-by: LiZhenCheng9527 <[email protected]>
byhlel · Sep 14, 2024 · 36825ab · 36825ab
1 parent bc49986
commit 36825ab
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/pkg/controller/telemetry/metric.go b/pkg/controller/telemetry/metric.go
@@ -361,12 +361,7 @@ func (m *MetricController) getWorkloadByAddress(address []byte) (*workloadapi.Wo
 	networkAddr.Address, _ = netip.AddrFromSlice(address)
 	workload := m.workloadCache.GetWorkloadByAddr(networkAddr)
 	if workload == nil {
-<<<<<<< HEAD
-		log.Debugf("cannot find workload %s", networkAddr.Address.String())
-		return nil, ""
-=======
 		return nil, networkAddr.Address.String()
->>>>>>> 6abe3a1 (change Ip conversion)
 	}
 	return workload, networkAddr.Address.String()
 }