Merge pull request #663 from l1b0k/release-1.8

fix: some compare logic
AliyunContainerService · Aug 12, 2024 · 6de5139 · 6de5139
2 parents e51e879 + e1cae0f
commit 6de5139
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/pkg/apis/crds/register.go b/pkg/apis/crds/register.go
@@ -93,7 +93,7 @@ func CreateOrUpdateCRD(ctx context.Context, c client.Client, name string) error
 	}
 
 	result := semver.Compare(exist.Annotations[crdVersionKey], expect.Annotations[crdVersionKey])
-	if result <= 0 {
+	if result >= 0 {
 		return nil
 	}
 	log.Info("update crd", "exist", exist.Annotations[crdVersionKey], "expect", expect.Annotations[crdVersionKey])

diff --git a/pkg/eni/local.go b/pkg/eni/local.go
@@ -438,7 +438,7 @@ func (l *Local) Allocate(ctx context.Context, cni *daemon.CNI, request ResourceR
 		}
 	}
 
-	if expectV4 > 0 && expectV6 > 0 && l.ipAllocInhibitExpireAt.After(time.Now()) {
+	if (expectV4 > 0 || expectV6 > 0) && l.ipAllocInhibitExpireAt.After(time.Now()) {
 		log.Info("eni alloc inhibit", "expire", l.ipAllocInhibitExpireAt.String())
 		return nil, []Trace{{Condition: InsufficientVSwitchIP, Reason: fmt.Sprintf("alloc inhibit, expire at %s", l.ipAllocInhibitExpireAt.String())}}
 	}

diff --git a/pkg/eni/local_test.go b/pkg/eni/local_test.go
@@ -6,6 +6,7 @@ import (
 	"net/netip"
 	"sync"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/time/rate"
@@ -265,6 +266,19 @@ func TestLocal_Allocate_ERDMA(t *testing.T) {
 	assert.Equal(t, ResourceTypeMismatch, resp[0].Condition)
 }
 
+func TestLocal_Allocate_Inhibit(t *testing.T) {
+	local := NewLocalTest(&daemon.ENI{ID: "eni-1"}, nil, &types.PoolConfig{MaxIPPerENI: 2, EnableIPv4: true}, "")
+
+	request := &LocalIPRequest{}
+	cni := &daemon.CNI{PodID: "pod-1"}
+
+	local.ipAllocInhibitExpireAt = time.Now().Add(time.Minute)
+
+	allocResp, resp := local.Allocate(context.Background(), cni, request)
+	assert.Nil(t, allocResp)
+	assert.Equal(t, 1, len(resp))
+}
+
 func Test_parseResourceID(t *testing.T) {
 	type args struct {
 		id string