fix(pool): panic when detect conflict failed

ucloud · Jun 11, 2024 · 0f0c0af · 0f0c0af
1 parent 343f21a
commit 0f0c0af
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/ipamd/pool.go b/pkg/ipamd/pool.go
@@ -141,9 +141,9 @@ func (s *ipamServer) getPodIp(r *rpc.AddPodNetworkRequest) (*rpc.PodNetwork, err
 		err = s.checkIPConflict(pn.VPCIP)
 		if err != nil {
 			ulog.Errorf("Detect ip conflict for %s error: %v, we will release it", pn.VPCIP, err)
-			err = s.uapiDeleteSecondaryIp(pn.VPCIP)
-			if err != nil {
-				ulog.Errorf("Release ip %s after conflict error: %v", pn.VPCIP, err)
+			delErr := s.uapiDeleteSecondaryIp(pn.VPCIP)
+			if delErr != nil {
+				ulog.Errorf("Release ip %s after conflict error: %v", pn.VPCIP, delErr)
 				return nil, err
 			}
 			return nil, err