ipam: Decouple ENI device configuration from CRD allocator#45027
Open
HadrienPatte wants to merge 1 commit intomainfrom
Open
ipam: Decouple ENI device configuration from CRD allocator#45027HadrienPatte wants to merge 1 commit intomainfrom
HadrienPatte wants to merge 1 commit intomainfrom
Conversation
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
HadrienPatte
added
area/eni
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
Member
Author
|
/test |
HadrienPatte
force-pushed
the
pr/HadrienPatte/ENIDeviceConfigurator
branch
from
412548a to
592ee1e
Compare
|
/test |
HadrienPatte
force-pushed
the
pr/HadrienPatte/ENIDeviceConfigurator
branch
from
592ee1e to
1ac0d93
Compare
Member
Author
|
/test |
HadrienPatte
changed the title
pippolo84
requested changes
Mar 30, 2026
| return nil | ||
| } | ||
|
|
||
| configureENIDevices(logger, prevNode, ev.Object, mtuConfig, sysctl) |
Member
There was a problem hiding this comment.
Shouldn't we also validate the ENI config here (and avoid the devices config if not valid) like we did before in updateLocalNodeResource? Otherwise I'm afraid we will reintroduce the issue fixed in #41760
Member
Author
There was a problem hiding this comment.
Good catch 👍 I moved the validateENIConfig call from updateLocalNodeResource to startENIDeviceConfigurator along with the previously moved configureENIDevices call.
While at it I also moved the validateENIConfig function definition from crd.go to eni.go (and its tests from crd_test.go to eni_test.go)
Extract ENI device configuration into a standalone CiliumNode observer that runs independently of the IPAM allocator. Previously, `configureENIDevices` was called from `nodeStore.updateLocalNodeResource`, coupling ENI network device setup to the CRD allocator code path. The new observer follows the same `job.Observer` pattern used by `startLocalNodeAllocCIDRsSync` in the multi-pool allocator. It watches CiliumNode updates and configures newly attached ENI devices regardless of which allocator is active. Relates to [cilium/design-cfps#87](cilium/design-cfps#87) Signed-off-by: Hadrien Patte <[email protected]>
HadrienPatte
force-pushed
the
pr/HadrienPatte/ENIDeviceConfigurator
branch
from
1ac0d93 to
ce15d92
Compare
Member
Author
|
/test |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Extract ENI device configuration into a standalone CiliumNode observer that runs independently of the IPAM allocator. Previously,
configureENIDeviceswas called fromnodeStore.updateLocalNodeResource, coupling ENI network device setup to the CRD allocator code path.The new observer follows the same
job.Observerpattern used bystartLocalNodeAllocCIDRsSyncin the multi-pool allocator. It watches CiliumNode updates and configures newly attached ENI devices regardless of which allocator is active.Relates to cilium/design-cfps#87