Skip to content
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.

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

Deallocate IP address according to warm IP target when multiple enis are present #2368

Merged
merged 1 commit into from
May 12, 2023

Conversation

bikashmishra100
Copy link
Contributor

What type of PR is this?
bug

Which issue does this PR fix:
#2363

What does this PR do / Why do we need it:
Previously when multiple enis were present on the host, the deallocation loop used to exit when first eni did not have any available IP addresses to free. This PR fixes that. Also the PR deallocates exactly the required addresses below the target in case of multiple enis.

If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:

Testing done on this change:

Automation added to e2e:

Will this PR introduce any new dependencies?:
No

Will this break upgrades or downgrades. Has updating a running cluster been tested?:
No

Does this change require updates to the CNI daemonset config files to work?:
No

Does this PR introduce any user-facing change?:
No


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Copy link
Contributor

@jdn5126 jdn5126 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the contribution @bikashmishra100 ! Just a few nits from me

pkg/ipamd/ipamd.go Outdated Show resolved Hide resolved
pkg/ipamd/ipamd_test.go Show resolved Hide resolved
pkg/ipamd/ipamd_test.go Show resolved Hide resolved
@jdn5126
Copy link
Contributor

jdn5126 commented May 12, 2023

@bikashmishra100 sorry for the delay. I approved these changes, but it looks like this branch requires merge conflict resolution. Can you rebase and resolve conflicts? Also @jayanthvn can you review as well?

@bikashmishra100
Copy link
Contributor Author

No problem at all @jdn5126 . I have squashed all the commits and rebased it.

@jdn5126 jdn5126 merged commit fb72ec0 into aws:master May 12, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants