Merge pull request #609 from l1b0k/fix/cal

fix: cal max pods
AliyunContainerService · Apr 18, 2024 · a74bb3d · a74bb3d
2 parents c17a149 + 0327744
commit a74bb3d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/pkg/eni/local.go b/pkg/eni/local.go
@@ -350,6 +350,9 @@ func (l *Local) Allocate(ctx context.Context, cni *daemon.CNI, request ResourceR
 
 	if l.enableIPv4 {
 		if lo.NoCache {
+			if len(l.ipv4)+l.allocatingV4 >= l.cap {
+				return nil, []Trace{{Condition: Full}}
+			}
 			expectV4 = 1
 		} else {
 			ipv4 := l.ipv4.PeekAvailable(cni.PodID)
@@ -363,6 +366,9 @@ func (l *Local) Allocate(ctx context.Context, cni *daemon.CNI, request ResourceR
 
 	if l.enableIPv6 {
 		if lo.NoCache {
+			if len(l.ipv6)+l.allocatingV6 >= l.cap {
+				return nil, []Trace{{Condition: Full}}
+			}
 			expectV6 = 1
 		} else {
 			ipv6 := l.ipv6.PeekAvailable(cni.PodID)

diff --git a/pkg/eni/local_test.go b/pkg/eni/local_test.go
@@ -200,3 +200,17 @@ func TestLocal_DisposeWholeENI(t *testing.T) {
 	assert.Equal(t, 1, n)
 	assert.Equal(t, statusDeleting, local.status)
 }
+
+func TestLocal_Allocate_NoCache(t *testing.T) {
+	local := NewLocalTest(&daemon.ENI{ID: "eni-1"}, nil, &types.PoolConfig{MaxIPPerENI: 2, EnableIPv4: true})
+
+	request := &LocalIPRequest{NoCache: true}
+	cni := &daemon.CNI{PodID: "pod-1"}
+
+	local.ipv4.Add(NewValidIP(netip.MustParseAddr("192.0.2.1"), false))
+	local.ipv4.Add(NewValidIP(netip.MustParseAddr("192.0.2.2"), false))
+
+	_, resp := local.Allocate(context.Background(), cni, request)
+
+	assert.Equal(t, 1, len(resp))
+}