From da2be265dfbce7629a5d07f642149d6c67e4126e Mon Sep 17 00:00:00 2001 From: l1b0k Date: Fri, 10 Jan 2025 20:24:53 +0800 Subject: [PATCH] fix: trunk quantity cal some instance has member eni , but trunk is not supported Signed-off-by: l1b0k --- pkg/controller/node/node.go | 2 +- pkg/eni/node_reconcile.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/node/node.go b/pkg/controller/node/node.go index 5f9f53c7..beb9e238 100644 --- a/pkg/controller/node/node.go +++ b/pkg/controller/node/node.go @@ -303,7 +303,7 @@ func (r *ReconcileNode) patchNodeRes(ctx context.Context, k8sNode *corev1.Node, }) if found { - members := node.Spec.NodeCap.TotalAdapters - node.Spec.NodeCap.Adapters + members := node.Spec.NodeCap.MemberAdapterLimit // report rse only trunk eni is ready num = resource.NewQuantity(int64(members), resource.DecimalSI) diff --git a/pkg/eni/node_reconcile.go b/pkg/eni/node_reconcile.go index 80928317..d7852fe2 100644 --- a/pkg/eni/node_reconcile.go +++ b/pkg/eni/node_reconcile.go @@ -125,7 +125,7 @@ func (r *nodeReconcile) Reconcile(ctx context.Context, request reconcile.Request if eniConfig.EnableENITrunking { node.Spec.ENISpec.EnableTrunk = true - if node.Spec.NodeCap.TotalAdapters-node.Spec.NodeCap.Adapters <= 0 { + if node.Spec.NodeCap.MemberAdapterLimit <= 0 { node.Spec.ENISpec.EnableTrunk = false l.Info("instance is not support trunk") }