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

RefreshSecurityGroups must be called after unmanaged ENIs are set #2475

Merged
merged 2 commits into from
Jul 20, 2023

Conversation

jdn5126
Copy link
Contributor

@jdn5126 jdn5126 commented Jul 19, 2023

What type of PR is this?
bug

Which issue does this PR fix:
#2470

What does this PR do / Why do we need it:
This PR moves the call to RefreshSGIDs to nodeInit after unmanaged ENIs are set. This is required to fix a regression where security groups on unmanaged ENIs were getting modified during node init.

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

Testing done on this change:
This is caused by #2427, which fixed #2426. I manually verified that #2426 is still fixed.

I also manually verified the dependencies on the ordering here. All integration tests pass, and I am kicking off a GitHub runner for this as well.

I filed #2474 to add more integration test coverage for unmanaged ENIs.

Automation added to e2e:
N/A

Will this PR introduce any new dependencies?:
No

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

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

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

Fix regression where unmanaged ENIs had their security groups modified during init.

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

@jdn5126 jdn5126 requested a review from a team as a code owner July 19, 2023 15:36
@jdn5126
Copy link
Contributor Author

jdn5126 commented Jul 19, 2023

Copy link
Contributor

@jayanthvn jayanthvn left a comment

Choose a reason for hiding this comment

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

minor nit..rest lgtm.

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

@jayanthvn jayanthvn left a comment

Choose a reason for hiding this comment

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

lgtm

@jdn5126 jdn5126 merged commit 3d29b3f into aws:master Jul 20, 2023
4 checks passed
@jdn5126 jdn5126 deleted the unmanaged_enis branch July 20, 2023 20:24
jdn5126 added a commit that referenced this pull request Jul 24, 2023
) (#2477)

* call refresh security groups after unmanaged ENIs are set

* update RefreshSGIDs comment
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.

Custom Networking ENIs fail to attach in v1.13.0 when no security groups are specified
2 participants