Merge pull request #818 from l1b0k/fix/eni

fix(demon): update config and logging for ENIOnly mode

Author: BSWANG

daemon/builder.go

@@ -120,6 +120,8 @@ func (b *NetworkServiceBuilder) InitK8S() *NetworkServiceBuilder {
 
 	if types.NodeExclusiveENIMode(b.service.k8s.Node().Labels) == types.ExclusiveENIOnly {
 		b.service.daemonMode = daemon.ModeENIOnly
+		b.daemonMode = daemon.ModeENIOnly
+		b.service.ipamType = types.IPAMTypeCRD
 	}
 
 	if utils.ISLinJunNode(b.service.k8s.Node().Labels) {
@@ -382,34 +384,40 @@ func (b *NetworkServiceBuilder) setupENIManager() error {
 
 	var eniList []eni.NetworkInterface
 
-	var (
-		normalENICount int
-		erdmaENICount  int
-	)
-	for _, ni := range attached {
-		serviceLog.V(5).Info("found attached eni", "eni", ni)
-		if b.config.EnableENITrunking && ni.Trunk && trunkENIID == ni.ID {
-			lo := eni.NewLocal(ni, "trunk", factory, poolConfig)
-			normalENICount++
-			eniList = append(eniList, eni.NewTrunk(b.service.k8s.GetClient(), lo))
-		} else if b.config.EnableERDMA && ni.ERdma {
-			erdmaENICount++
-			eniList = append(eniList, eni.NewLocal(ni, "erdma", factory, poolConfig))
-		} else {
-			normalENICount++
-			eniList = append(eniList, eni.NewLocal(ni, "secondary", factory, poolConfig))
+	if b.daemonMode == daemon.ModeENIOnly {
+		eniList = append(eniList, eni.NewRemote(b.service.k8s.GetClient(), nil))
+	} else {
+		var (
+			normalENICount int
+			erdmaENICount  int
+		)
+		for _, ni := range attached {
+			serviceLog.Info("found attached eni", "eni", ni)
+			if b.config.EnableENITrunking && ni.Trunk && trunkENIID == ni.ID {
+				lo := eni.NewLocal(ni, "trunk", factory, poolConfig)
+
+				serviceLog.Info("trunk inited")
+				normalENICount++
+				eniList = append(eniList, eni.NewTrunk(b.service.k8s.GetClient(), lo))
+			} else if b.config.EnableERDMA && ni.ERdma {
+				erdmaENICount++
+				eniList = append(eniList, eni.NewLocal(ni, "erdma", factory, poolConfig))
+			} else {
+				normalENICount++
+				eniList = append(eniList, eni.NewLocal(ni, "secondary", factory, poolConfig))
+			}
 		}
-	}
-	normalENINeeded := poolConfig.MaxENI - normalENICount
-	if b.config.EnableERDMA {
-		normalENINeeded = poolConfig.MaxENI - b.limit.ERDMARes() - normalENICount
-		for i := 0; i < b.limit.ERDMARes()-erdmaENICount; i++ {
-			eniList = append(eniList, eni.NewLocal(nil, "erdma", factory, poolConfig))
+		normalENINeeded := poolConfig.MaxENI - normalENICount
+		if b.config.EnableERDMA {
+			normalENINeeded = poolConfig.MaxENI - b.limit.ERDMARes() - normalENICount
+			for i := 0; i < b.limit.ERDMARes()-erdmaENICount; i++ {
+				eniList = append(eniList, eni.NewLocal(nil, "erdma", factory, poolConfig))
+			}
 		}
-	}
 
-	for i := 0; i < normalENINeeded; i++ {
-		eniList = append(eniList, eni.NewLocal(nil, "secondary", factory, poolConfig))
+		for i := 0; i < normalENINeeded; i++ {
+			eniList = append(eniList, eni.NewLocal(nil, "secondary", factory, poolConfig))
+		}
 	}
 
 	eniManager := eni.NewManager(poolConfig.MinPoolSize, poolConfig.MaxPoolSize, poolConfig.Capacity, 30*time.Second, eniList, daemon.EniSelectionPolicy(b.config.EniSelectionPolicy), b.service.k8s)

daemon/config.go

@@ -84,6 +84,39 @@ func getPoolConfig(cfg *daemon.Config, daemonMode string, limit *client.Limits)
 	maxMemberENI := 0
 
 	switch daemonMode {
+	case daemon.ModeENIOnly:
+		maxENI = limit.Adapters
+		maxENI = int(float64(maxENI)*cfg.EniCapRatio) + cfg.EniCapShift - 1
+
+		// set max eni node can use
+		if cfg.MaxENI > 0 && cfg.MaxENI < maxENI {
+			maxENI = cfg.MaxENI
+		}
+
+		capacity = maxENI
+
+		if cfg.MaxPoolSize > maxENI {
+			poolConfig.MaxPoolSize = maxENI
+		} else {
+			poolConfig.MaxPoolSize = cfg.MaxPoolSize
+		}
+
+		poolConfig.MinPoolSize = cfg.MinPoolSize
+
+		if cfg.MinENI > 0 {
+			poolConfig.MinPoolSize = cfg.MinENI
+		}
+
+		if poolConfig.MinPoolSize > poolConfig.MaxPoolSize {
+			poolConfig.MinPoolSize = poolConfig.MaxPoolSize
+		}
+
+		poolConfig.MaxIPPerENI = 1
+		if cfg.EnableERDMA {
+			poolConfig.ERdmaCapacity = limit.ERdmaAdapters
+		}
+		poolConfig.MaxPoolSize = 0
+		poolConfig.MinPoolSize = 0
 	case daemon.ModeENIMultiIP:
 		maxENI = limit.Adapters
 		maxENI = int(float64(maxENI)*cfg.EniCapRatio) + cfg.EniCapShift - 1