Bug Fix: Block IMDS in branch ENIs #4484
Merged
+18
−11
Conversation
This file contains 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
amogh09
approved these changes
Jan 29, 2025
sparrc
approved these changes
Jan 30, 2025
xxx0624
approved these changes
Jan 30, 2025
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
This PR fixes an issue in warmpool branch ENIs. Tasks running on trunk ENIs in awsvpc mode need to block access to IMDS endpoint to be consistent with existing awsvpc behaviour.
Implementation details
Populate the
BlockIMDSattribute inVPCBranchENIConfigwhen we create branch ENIs. This attribute is a config parameter for the CNI plugin to configures vpc branch enis.Testing
(See internal document for details)
Note for external contributors:
make testandmake run-integ-testscan run in a Linux developmentenvironment like your laptop.
go test -timeout=30s ./agent/...and.\scripts\run-integ.tests.ps1can run in a Windows development environmentlike your laptop. Please ensure unit and integration tests pass (on at least
one platform) before opening the pull request.
Once you open the pull request, there will be 14 automatic test checks on the bottom
of the pull request, please make sure they all pass before you merge it. You can
use
bot/testlabel to rerun the automatic tests multiple times.-->
New tests cover the changes:
No, we have end to end tests in Fargate Agent that validates this behavior.
Description for the changelog
Bug: Fixed issue in Fargate Trunk ENIs in non-firecracker platforms. This change blocks IMDS in awsvpc task network namespace.
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?
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.