Skip to content

Assign EIP only to primary ENI #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antonipp merged 1 commit into from
Nov 12, 2025
Merged

Assign EIP only to primary ENI #636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions pkg/aws/eni/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,13 +324,17 @@ func (n *Node) AllocateIPs(ctx context.Context, a *ipam.AllocationAction) error
func (n *Node) AllocateStaticIP(ctx context.Context, staticIPTags ipamTypes.Tags) (string, error) {
n.mutex.RLock()
defer n.mutex.RUnlock()

for _, eni := range n.enis {
if eni.PublicIP == "" {
if eni.Number == 0 {
if eni.PublicIP != "" {
return eni.PublicIP, nil
}
return n.manager.api.AssociateEIP(ctx, eni.ID, staticIPTags)
}
}

return "", fmt.Errorf("no ENI found to associate static IP")
return "", fmt.Errorf("no primary ENI found")
}

func (n *Node) getSecurityGroupIDs(ctx context.Context, eniSpec eniTypes.ENISpec) ([]string, error) {
Expand Down Expand Up @@ -629,6 +633,12 @@ func (n *Node) ResyncInterfacesAndIPs(ctx context.Context, scopedLog *slog.Logge

n.enis[e.ID] = *e

// Check for public IP on primary ENI before exclusion logic
// The primary ENI may be excluded from IPAM but we still need to track its public IP
if e.Number == 0 && e.PublicIP != "" {
stats.AssignedStaticIP = e.PublicIP
}

// 3. Finally, we iterate any already existing interfaces and add on any extra
// capacity to account for leftover prefix delegated /28 ip slots.
leftoverPrefixCapcity, effectiveLimits := n.getEffectiveIPLimits(e, limits.IPv4)
Expand All @@ -650,11 +660,6 @@ func (n *Node) ResyncInterfacesAndIPs(ctx context.Context, scopedLog *slog.Logge
available[ip] = ipamTypes.AllocationIP{Resource: e.ID}
}

// If the primary ENI has a public IP, we store it
if e.Number == 0 && e.PublicIP != "" {
stats.AssignedStaticIP = e.PublicIP
}

return nil
})
enis := len(n.enis)
Expand Down
Loading