Fix local IP address depletion by cleaning up network bridges for aws… #4741
+213
−11
Conversation
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
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
tshan2001
changed the title
tshan2001
force-pushed
the
master
branch
2 times, most recently
from
04ab1b2 to
5d61c72
Compare
tshan2001
changed the title
JoseVillalta
reviewed
Aug 5, 2025
| require.NoError(t, err) | ||
| } | ||
|
|
||
| func testManaedLinuxBranchENIConfiguration(t *testing.T) { |
There was a problem hiding this comment.
Pushed a new rev to fix this
| @@ -36,6 +42,88 @@ const ( | |||
| macAddress = "0a:1b:2c:3d:4e:5f" | |||
| ) | |||
|
|
|||
| func TestManagedLinux_TestConfigureInterface(t *testing.T) { | |||
| t.Run("regular-eni", testManagedLinuxRegularENIConfiguration) | |||
| t.Run("branch-eni", testManaedLinuxBranchENIConfiguration) | |||
There was a problem hiding this comment.
Pushed a new rev to fix this
JoseVillalta
reviewed
Aug 5, 2025
xxx0624
approved these changes
Aug 5, 2025
| case networkinterface.V2NInterfaceAssociationProtocol: | ||
| err = m.common.configureGENEVEInterface(ctx, netNSPath, iface, netDAO) | ||
| case networkinterface.VETHInterfaceAssociationProtocol: | ||
| // Do nothing. |
There was a problem hiding this comment.
nit: can we have a comment about why?
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Scope down IP address depletion fix to managed linux platform only.
Previously in #4717, we made the change to fix the IP address depletion issue (for managed linux platform). However, since the change was made in common_linux, it introduced bug in existing platforms. This change is to scope down the fix to only apply to the managed linux platform.
Implementation details
Instead of invoking the CNI clean-up logic in the common_linux code path, methods
configureRegularENIandconfigureBranchENIare created for the managed_linux platform, where we will use logic specific to managed linux platform, instead of using the common code path.Testing
Unit Test
New tests cover the changes: YES
Introduced new unit tests
TestManagedLinux_TestConfigureInterface/regular-eniandTestManagedLinux_TestConfigureInterface/branch-eniE2E Testing
Launched and stopped multiple tasks on the same host, then examined the CNI plugin log.
For task
8d919a758df041ba9f251e033275c961, saw the following:Specifically, these 2 lines at the bottom prove that the fix to clean up netns kicked in:
Description for the changelog
Scope down IP address depletion fix to managed linux platform only.
Additional Information
Does this PR include breaking model changes? If so, Have you added transformation functions?
NO
Does this PR include the addition of new environment variables in the README?
NO
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.