Merge pull request #778 from l1b0k/release-1.8

fix: potential deadlock
AliyunContainerService · Jan 24, 2025 · f3d812c · f3d812c
2 parents 5c26186 + 16efb6d
commit f3d812c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/eni/manager.go b/pkg/eni/manager.go
@@ -207,7 +207,11 @@ func (m *Manager) Allocate(ctx context.Context, cni *daemon.CNI, req *AllocReque
 					cancel()
 					break
 				}
-				resultCh <- resp.NetworkConfigs
+
+				select {
+				case <-ctx.Done():
+				case resultCh <- resp.NetworkConfigs:
+				}
 			}
 		}()
 	}