Skip to content

Commit 1bfb14b

Browse files
authored
Merge pull request #907 from l1b0k/main
refactor(pod-eni): optimize node handling for LinJun nodes
2 parents 2d74919 + 0acbb31 commit 1bfb14b

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

pkg/controller/pod-eni/eni_controller.go

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -694,16 +694,25 @@ func (m *ReconcilePodENI) attachENI(ctx context.Context, podENI *v1beta1.PodENI,
694694
podENI.Status.ENIInfos = make(map[string]v1beta1.ENIInfo)
695695
lock := sync.Mutex{}
696696

697-
crNode := &v1beta1.Node{}
698-
err := m.client.Get(ctx, k8stypes.NamespacedName{Name: nodeName}, crNode)
697+
node := &corev1.Node{}
698+
err := m.client.Get(ctx, k8stypes.NamespacedName{Name: nodeName}, node)
699699
if err != nil {
700700
finalErr = err
701701
return err
702702
}
703703

704704
var ecsHighDensity bool
705-
if crNode.Annotations[types.ENOApi] == types.APIEcsHDeni {
706-
ecsHighDensity = true
705+
if utils.ISLinJunNode(node.Labels) {
706+
crNode := &v1beta1.Node{}
707+
err := m.client.Get(ctx, k8stypes.NamespacedName{Name: nodeName}, crNode)
708+
if err != nil {
709+
finalErr = err
710+
return err
711+
}
712+
713+
if crNode.Annotations[types.ENOApi] == types.APIEcsHDeni {
714+
ecsHighDensity = true
715+
}
707716
}
708717

709718
g, _ := errgroup.WithContext(context.Background())

0 commit comments

Comments
 (0)