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

Fix MTU parameter in egress-v4-cni plugin #2295

Merged
merged 2 commits into from
Mar 3, 2023
Merged

Conversation

jdn5126
Copy link
Contributor

@jdn5126 jdn5126 commented Mar 1, 2023

What type of PR is this?
bug

Which issue does this PR fix:
#2293

What does this PR do / Why do we need it:
This PR updates the default 10-aws.conflist so that the MTU set for egress-v4-cni plugin is a string rather than an integer. This was causing an issue when ENABLE_BANDWIDTH_PLUGIN environment variable was set, as we call json.Unmarshal on the default conflist and fail to parse 9001 as a string.

I added a unit test in cmd/aws-vpc-cni/ to cover this specific case. I explicitly avoided using gomock for this test case to keep things simple.

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:
Added a unit test to validate json marshaling of conflist.

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 conflist parsing when ENABLE_BANDWIDTH_PLUGIN is set.

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 March 1, 2023 00:17
@jdn5126 jdn5126 force-pushed the json_conflist branch 2 times, most recently from c68093f to fbb2296 Compare March 1, 2023 23:07
cmd/aws-vpc-cni/main.go Outdated Show resolved Hide resolved
@jdn5126 jdn5126 merged commit f3859a5 into aws:master Mar 3, 2023
@jdn5126 jdn5126 deleted the json_conflist branch March 3, 2023 17:06
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.

4 participants