fix: empty trunk id

AliyunContainerService · Sep 12, 2023 · b093ac4 · b093ac4
1 parent 30a6f26
commit b093ac4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/daemon/eni-multi-ip.go b/daemon/eni-multi-ip.go
@@ -918,6 +918,7 @@ func newENIIPResourceManager(poolConfig *types.PoolConfig, ecs ipam.API, k8s Kub
 	factory := &eniIPFactory{
 		name:         factoryNameENIIP,
 		eniFactory:   eniFactory,
+		trunkOnEni:   poolConfig.TrunkENIID,
 		enableTrunk:  poolConfig.TrunkENIID != "",
 		enis:         []*ENI{},
 		eniOperChan:  make(chan struct{}, maxEniOperating),

diff --git a/daemon/eni.go b/daemon/eni.go
@@ -188,6 +188,7 @@ func newENIFactory(poolConfig *types.PoolConfig, ecs ipam.API) (*eniFactory, err
 		vSwitchOptions:            poolConfig.VSwitchOptions,
 		eniTags:                   poolConfig.ENITags,
 		securityGroupIDs:          poolConfig.SecurityGroupIDs,
+		trunkOnEni:                poolConfig.TrunkENIID,
 		enableTrunk:               poolConfig.TrunkENIID != "",
 		instanceID:                poolConfig.InstanceID,
 		ecs:                       ecs,