Rearrange ENI Pod deletion

aws · Dec 9, 2020 · 7b36358 · 7b36358
1 parent 84542f5
commit 7b36358
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/pkg/ipamd/rpc_handler.go b/pkg/ipamd/rpc_handler.go
@@ -188,7 +188,14 @@ func (s *server) DelNetwork(ctx context.Context, in *rpc.DelNetworkRequest) (*rp
 		return nil, err
 	}
 
-	if s.ipamContext.enablePodENI {
+	ipamKey := datastore.IPAMKey{
+		ContainerID: in.ContainerID,
+		IfName:      in.IfName,
+		NetworkName: in.NetworkName,
+	}
+	ip, deviceNumber, err := s.ipamContext.dataStore.UnassignPodIPv4Address(ipamKey)
+
+	if err == datastore.ErrUnknownPod && s.ipamContext.enablePodENI {
 		pod, err := s.ipamContext.GetPod(in.K8S_POD_NAME, in.K8S_POD_NAMESPACE)
 		if err != nil {
 			if k8serror.IsNotFound(err) {
@@ -213,12 +220,6 @@ func (s *server) DelNetwork(ctx context.Context, in *rpc.DelNetworkRequest) (*rp
 			}
 		}
 	}
-	ipamKey := datastore.IPAMKey{
-		ContainerID: in.ContainerID,
-		IfName:      in.IfName,
-		NetworkName: in.NetworkName,
-	}
-	ip, deviceNumber, err := s.ipamContext.dataStore.UnassignPodIPv4Address(ipamKey)
 
 	log.Infof("Send DelNetworkReply: IPv4Addr %s, DeviceNumber: %d, err: %v", ip, deviceNumber, err)