get trunk eni id by node annotation

trunkENIID is obtained by node annotation when wait trunk eni feature is enabled

Author: l1b0k

daemon/daemon.go

@@ -19,7 +19,6 @@ import (
 	podENITypes "github.com/AliyunContainerService/terway/pkg/apis/network.alibabacloud.com/v1beta1"
 	"github.com/AliyunContainerService/terway/pkg/backoff"
 	terwayIP "github.com/AliyunContainerService/terway/pkg/ip"
-	"github.com/AliyunContainerService/terway/pkg/ipam"
 	"github.com/AliyunContainerService/terway/pkg/link"
 	"github.com/AliyunContainerService/terway/pkg/logger"
 	"github.com/AliyunContainerService/terway/pkg/metric"
@@ -1452,10 +1451,6 @@ func newNetworkService(configFilePath, kubeconfig, master, daemonMode string) (r
 	}
 	serviceLog.Infof("init pool config: %+v", poolConfig)
 
-	err = restoreLocalENIRes(ecs, netSrv.k8s, netSrv.resourceDB)
-	if err != nil {
-		return nil, errors.Wrapf(err, "error restore local eni resources")
-	}
 	localResource := make(map[string]map[string]resourceManagerInitItem)
 	resObjList, err := netSrv.resourceDB.List()
 	if err != nil {
@@ -1549,51 +1544,6 @@ func newNetworkService(configFilePath, kubeconfig, master, daemonMode string) (r
 	return netSrv, nil
 }
 
-// restore local eni resources for old terway migration
-func restoreLocalENIRes(ecs ipam.API, k8s Kubernetes, resourceDB storage.Storage) error {
-	resList, err := resourceDB.List()
-	if err != nil {
-		return errors.Wrapf(err, "error list resourceDB storage")
-	}
-	if len(resList) != 0 {
-		serviceLog.Debugf("skip restore for upgraded")
-		return nil
-	}
-
-	eniList, err := ecs.GetAttachedENIs(context.Background(), false)
-	if err != nil {
-		return errors.Wrapf(err, "error get attached eni for restore")
-	}
-	ipEniMap := map[string]*types.ENI{}
-	for _, eni := range eniList {
-		ipEniMap[eni.PrimaryIP.IPv4.String()] = eni
-	}
-
-	podList, err := k8s.GetLocalPods()
-	if err != nil {
-		return errors.Wrapf(err, "error get local pod for restore")
-	}
-	for _, pod := range podList {
-		if pod.PodNetworkType != podNetworkTypeVPCENI {
-			continue
-		}
-		serviceLog.Debugf("restore for local pod: %+v, enis: %+v", pod, ipEniMap)
-		eni, ok := ipEniMap[pod.PodIPs.IPv4.String()]
-		if ok {
-			err = resourceDB.Put(podInfoKey(pod.Namespace, pod.Name), types.PodResources{
-				PodInfo:   pod,
-				Resources: eni.ToResItems(),
-			})
-			if err != nil {
-				return errors.Wrapf(err, "error put resource into store")
-			}
-		} else {
-			serviceLog.Warnf("error found pod relate eni, pod: %+v", pod)
-		}
-	}
-	return nil
-}
-
 // setup default value
 func setDefault(cfg *daemon.Config) error {
 	if cfg.EniCapRatio == 0 {

daemon/eni-multi-ip.go

@@ -781,7 +781,7 @@ func (f *eniIPFactory) checkAccount(message chan<- string) {
 	// get ENIs via Aliyun API
 	message <- "fetching attached ENIs from aliyun\n"
 	ctx := context.Background()
-	enis, err := f.eniFactory.ecs.GetAttachedENIs(ctx, false)
+	enis, err := f.eniFactory.ecs.GetAttachedENIs(ctx, false, f.trunkOnEni)
 	if err != nil {
 		message <- fmt.Sprintf("error while fetching from remote: %s\n", err.Error())
 		return
@@ -943,7 +943,7 @@ func newENIIPResourceManager(poolConfig *types.PoolConfig, ecs ipam.API, k8s Kub
 		Initializer: func(holder pool.ResourceHolder) error {
 			ctx := context.Background()
 			// not use main ENI for ENI multiple ip allocate
-			enis, err := ecs.GetAttachedENIs(ctx, false)
+			enis, err := ecs.GetAttachedENIs(ctx, false, factory.trunkOnEni)
 			if err != nil {
 				return fmt.Errorf("error get attach ENI on pool init, %w", err)
 			}

daemon/eni.go

@@ -106,7 +106,7 @@ func newENIResourceManager(poolConfig *types.PoolConfig, ecs ipam.API, allocated
 		Factory:  factory,
 		Initializer: func(holder pool.ResourceHolder) error {
 			ctx := context.Background()
-			enis, err := ecs.GetAttachedENIs(ctx, false)
+			enis, err := ecs.GetAttachedENIs(ctx, false, factory.trunkOnEni)
 			if err != nil {
 				return fmt.Errorf("error get attach ENI on pool init, %w", err)
 			}
@@ -425,7 +425,7 @@ func (f *eniFactory) Check(res types.NetworkResource) error {
 }
 
 func (f *eniFactory) ListResource() (map[string]types.NetworkResource, error) {
-	enis, err := f.ecs.GetAttachedENIs(context.Background(), false)
+	enis, err := f.ecs.GetAttachedENIs(context.Background(), false, f.trunkOnEni)
 	if err != nil {
 		return nil, err
 	}

pkg/aliyun/aliyun.go

@@ -177,7 +177,7 @@ func (e *Impl) destroyInterface(ctx context.Context, eniID, instanceID, trunkENI
 
 // GetAttachedENIs of instanceId
 // containsMainENI is contains the main interface(eth0) of instance
-func (e *Impl) GetAttachedENIs(ctx context.Context, containsMainENI bool) ([]*types.ENI, error) {
+func (e *Impl) GetAttachedENIs(ctx context.Context, containsMainENI bool, trunkENIID string) ([]*types.ENI, error) {
 	enis, err := e.metadata.GetENIs(containsMainENI)
 	if err != nil {
 		return nil, fmt.Errorf("error get eni config by mac, %w", err)
@@ -188,14 +188,20 @@ func (e *Impl) GetAttachedENIs(ctx context.Context, containsMainENI bool) ([]*ty
 	for _, eni := range enis {
 		eniIDs = append(eniIDs, eni.ID)
 		enisMap[eni.ID] = eni
+
+		if trunkENIID == eni.ID {
+			eni.Trunk = true
+		}
 	}
 	if e.eniTypeAttr && len(eniIDs) > 0 {
-		eniSet, err := e.DescribeNetworkInterface(ctx, "", eniIDs, "", "", "", nil)
-		if err != nil {
-			return nil, err
-		}
-		for _, eni := range eniSet {
-			enisMap[eni.NetworkInterfaceID].Trunk = eni.Type == client.ENITypeTrunk
+		if trunkENIID == "" {
+			eniSet, err := e.DescribeNetworkInterface(ctx, "", eniIDs, "", "", "", nil)
+			if err != nil {
+				return nil, err
+			}
+			for _, eni := range eniSet {
+				enisMap[eni.NetworkInterfaceID].Trunk = eni.Type == client.ENITypeTrunk
+			}
 		}
 	}
 	return enis, nil

pkg/ipam/ipam.go

@@ -12,7 +12,7 @@ import (
 // API the interface of ecs operation set
 type API interface {
 	AllocateENI(ctx context.Context, vSwitch string, securityGroup []string, instanceID string, trunk bool, ipCount int, eniTags map[string]string) (*types.ENI, error)
-	GetAttachedENIs(ctx context.Context, containsMainENI bool) ([]*types.ENI, error)
+	GetAttachedENIs(ctx context.Context, containsMainENI bool, trunkENIID string) ([]*types.ENI, error)
 	GetSecondaryENIMACs(ctx context.Context) ([]string, error)
 	GetENIByMac(ctx context.Context, mac string) (*types.ENI, error)
 	FreeENI(ctx context.Context, eniID string, instanceID string) error