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

[release-1.31] Restore AWS node-name support and add IMDSv2 support #7354

Merged

Conversation

brandond
Copy link
Member

Proposed Changes

Types of Changes

Revert / enhancement

Verification

  • Start node with --cloud-provider-name=aws on EC2; note that node name is properly set and kubelet does not crash due to --cloud-provider=aws being passed in kubelet args.
  • Start node with --node-name-from-cloud-provider-metadata on EC2; note that node name is properly set.
  • Start node with either of the above on EC2 with IMDSv2 required; note that node name is properly set.

Testing

Linked Issues

User-Facing Change


Further Comments

This reverts commit 89a8d81.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 6e701fc)
Signed-off-by: Brad Davidson <[email protected]>
For now, the new flag is automatically set when cloud-provider-name=aws, but this will be removed in the future following our normal deprecation timeline.

This also adds IMDSv2 support, and support for setting the hostname on windows.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit de8240a)
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond requested a review from a team as a code owner November 27, 2024 18:50
@codecov-commenter
Copy link

codecov-commenter commented Nov 27, 2024

Codecov Report

Attention: Patch coverage is 0% with 73 lines in your changes missing coverage. Please review.

Project coverage is 23.23%. Comparing base (c3bb586) to head (2fdd322).

Files with missing lines Patch % Lines
pkg/rke2/rke2.go 0.00% 43 Missing ⚠️
pkg/rke2/rke2_linux.go 0.00% 29 Missing and 1 partial ⚠️
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.31    #7354      +/-   ##
================================================
- Coverage         23.70%   23.23%   -0.48%     
================================================
  Files                33       33              
  Lines              3392     3461      +69     
================================================
  Hits                804      804              
- Misses             2541     2609      +68     
- Partials             47       48       +1     
Flag Coverage Δ
inttests 8.81% <0.00%> (-0.18%) ⬇️
unittests 16.51% <0.00%> (-0.34%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@brandond brandond merged commit 8d5473d into rancher:release-1.31 Nov 27, 2024
7 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.

5 participants