Skip to content

Commit 5c1ac51

Browse files
authored
Merge pull request #289 from l1b0k/fix_copy
fix shallow copy
2 parents 31f4cae + ccb7371 commit 5c1ac51

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

pkg/controller/pod-eni/eni_controller.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ func (m *ReconcilePodENI) gcENIs(enis []ecs.NetworkInterfaceSet, force bool) err
361361
}
362362
layout := "2006-01-02T15:04:05Z"
363363
now := time.Now()
364-
for _, eni := range enis {
364+
for i, eni := range enis {
365365
if !m.eniFilter(eni, tagFilter) {
366366
continue
367367
}
@@ -376,7 +376,7 @@ func (m *ReconcilePodENI) gcENIs(enis []ecs.NetworkInterfaceSet, force bool) err
376376
continue
377377
}
378378
}
379-
eniMap[eni.NetworkInterfaceId] = &eni
379+
eniMap[eni.NetworkInterfaceId] = &enis[i]
380380
}
381381
if len(eniMap) == 0 {
382382
return nil
@@ -403,21 +403,21 @@ func (m *ReconcilePodENI) gcENIs(enis []ecs.NetworkInterfaceSet, force bool) err
403403
}
404404

405405
// 4. the left eni is going to be deleted
406-
for id, eni := range eniMap {
406+
for _, eni := range eniMap {
407407
if eni.Type == string(aliyun.ENITypeMember) && eni.Status == string(aliyun.ENIStatusInUse) {
408-
l.Info("detach eni", "eni", id, "trunk-eni", eni.Attachment.TrunkNetworkInterfaceId)
409-
err = m.aliyun.DetachNetworkInterface(context.Background(), id, eni.Attachment.InstanceId, eni.Attachment.TrunkNetworkInterfaceId)
408+
l.Info("detach eni", "eni", eni.NetworkInterfaceId, "trunk-eni", eni.Attachment.TrunkNetworkInterfaceId)
409+
err = m.aliyun.DetachNetworkInterface(context.Background(), eni.NetworkInterfaceId, eni.Attachment.InstanceId, eni.Attachment.TrunkNetworkInterfaceId)
410410
if err != nil {
411-
l.Error(err, fmt.Sprintf("errot detach eni %s", id))
411+
l.Error(err, fmt.Sprintf("errot detach eni %s", eni.NetworkInterfaceId))
412412
}
413413
// we continue here because we can delete eni in next check
414414
continue
415415
}
416416
if eni.Status == string(aliyun.ENIStatusAvailable) {
417-
l.Info("delete eni", "eni", id)
418-
err = m.aliyun.DeleteNetworkInterface(context.Background(), id)
417+
l.Info("delete eni", "eni", eni.NetworkInterfaceId)
418+
err = m.aliyun.DeleteNetworkInterface(context.Background(), eni.NetworkInterfaceId)
419419
if err != nil {
420-
l.Info(fmt.Sprintf("delete leaked eni %s, %s", id, err))
420+
l.Info(fmt.Sprintf("delete leaked eni %s, %s", eni.NetworkInterfaceId, err))
421421
}
422422
continue
423423
}

0 commit comments

Comments
 (0)