Merge pull request #917 from l1b0k/main

feat: add IP reclaim policy

Author: BSWANG

cmd/terway-controlplane/terway-controlplane.go

@@ -108,7 +108,7 @@ func main() {
 
 	flag.Parse()
 
-	ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
+	ctrl.SetLogger(textlogger.NewLogger(logCfg))
 	log.Info(version.Version)
 
 	err := utilfeature.DefaultMutableFeatureGate.SetFromMap(featureGates)

daemon/builder.go

@@ -400,7 +400,7 @@ func (b *NetworkServiceBuilder) setupENIManager() error {
 		}
 	}
 
-	eniManager := eni.NewManager(poolConfig.MinPoolSize, poolConfig.MaxPoolSize, poolConfig.Capacity, b.config.GetIPPoolSYncPeriod(), eniList, daemon.EniSelectionPolicy(b.config.EniSelectionPolicy), b.service.k8s)
+	eniManager := eni.NewManager(poolConfig, b.config.GetIPPoolSYncPeriod(), eniList, daemon.EniSelectionPolicy(b.config.EniSelectionPolicy), b.service.k8s)
 	b.service.eniMgr = eniManager
 	err = eniManager.Run(b.ctx, &b.service.wg, podResources)
 	if err != nil {
@@ -432,7 +432,7 @@ func (b *NetworkServiceBuilder) PostInitForLegacyMode() *NetworkServiceBuilder {
 		}
 		podResources := getPodResources(objList)
 
-		eniManager := eni.NewManager(0, 0, 0, 30*time.Second, eniList, daemon.EniSelectionPolicy(b.config.EniSelectionPolicy), b.service.k8s)
+		eniManager := eni.NewManager(nil, 30*time.Second, eniList, daemon.EniSelectionPolicy(b.config.EniSelectionPolicy), b.service.k8s)
 		b.service.eniMgr = eniManager
 		err = eniManager.Run(b.ctx, &b.service.wg, podResources)
 		if err != nil {
@@ -466,7 +466,7 @@ func (b *NetworkServiceBuilder) PostInitForCRDV2() *NetworkServiceBuilder {
 		return b
 	}
 	crdv2 := eni.NewCRDV2(b.service.k8s.NodeName(), b.namespace)
-	mgr := eni.NewManager(0, 0, 0, 0, []eni.NetworkInterface{crdv2}, daemon.EniSelectionPolicy(b.config.EniSelectionPolicy), nil)
+	mgr := eni.NewManager(nil, 0, []eni.NetworkInterface{crdv2}, daemon.EniSelectionPolicy(b.config.EniSelectionPolicy), nil)
 
 	svc := b.RunENIMgr(b.ctx, mgr)
 	go b.service.startGarbageCollectionLoop(b.ctx)

daemon/config.go

@@ -2,6 +2,8 @@ package daemon
 
 import (
 	"context"
+	"strconv"
+	"time"
 
 	"github.com/AliyunContainerService/terway/pkg/aliyun/client"
 	"github.com/AliyunContainerService/terway/pkg/k8s"
@@ -166,5 +168,28 @@ func getPoolConfig(cfg *daemon.Config, daemonMode string, limit *client.Limits)
 	poolConfig.MaxENI = maxENI
 	poolConfig.MaxMemberENI = maxMemberENI
 
+	poolConfig.ReclaimBatchSize = cfg.IdleIPReclaimBatchSize
+	if cfg.IdleIPReclaimInterval != nil {
+		interval, err := time.ParseDuration(*cfg.IdleIPReclaimInterval)
+		if err != nil {
+			return nil, err
+		}
+		poolConfig.ReclaimInterval = interval
+	}
+	if cfg.IdleIPReclaimAfter != nil {
+		after, err := time.ParseDuration(*cfg.IdleIPReclaimAfter)
+		if err != nil {
+			return nil, err
+		}
+		poolConfig.ReclaimAfter = after
+	}
+	if cfg.IdleIPReclaimJitterFactor != nil {
+		factor, err := strconv.ParseFloat(*cfg.IdleIPReclaimJitterFactor, 64)
+		if err != nil {
+			return nil, err
+		}
+		poolConfig.ReclaimFactor = factor
+	}
+
 	return poolConfig, nil
 }