solve conflict

LiZhenCheng9527 · LiZhenCheng9527 · commit 36825ab19f68 · 2024-09-14T16:31:40.000+08:00
Signed-off-by: LiZhenCheng9527 &lt;lizhencheng6@huawei.com&gt;
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()
 }

Original file line number	Diff line number	Diff line change
`@@ -361,12 +361,7 @@ func (m MetricController) getWorkloadByAddress(address []byte) (workloadapi.Wo`
`361`	`361`	`networkAddr.Address, _ = netip.AddrFromSlice(address)`
`362`	`362`	`workload := m.workloadCache.GetWorkloadByAddr(networkAddr)`
`363`	`363`	`if workload == nil {`
`364`		`-<<<<<<< HEAD`
`365`		`- log.Debugf("cannot find workload %s", networkAddr.Address.String())`
`366`		`- return nil, ""`
`367`		`-=======`
`368`	`364`	`return nil, networkAddr.Address.String()`
`369`		`->>>>>>> 6abe3a1 (change Ip conversion)`
`370`	`365`	`}`
`371`	`366`	`return workload, networkAddr.Address.String()`
`372`	`367`	`}`