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.

Sign up for GitHub

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

Jump to bottom

fix: retry AWS hotplug for async IMDS #5995

Merged
merged 2 commits into from
Feb 3, 2025
Merged

fix: retry AWS hotplug for async IMDS #5995

merged 2 commits into from
Feb 3, 2025
+85 −9

Conversation

holmanb
Copy link
Member

@holmanb holmanb commented Jan 31, 2025 •
edited
Loading

Proposed Commit Message

fix: Retry AWS hotplug for async IMDS

Make tests more robust to temporary network failure.
Document hotplug limitations.

Fixes GH-5373

Additional Context

#5373 (comment)

Test Steps

CLOUD_INIT_PLATFORM="ec2" CLOUD_INIT_INSTANCE_TYPE="m6in.32xlarge" CLOUD_INIT_OS_IMAGE="noble" CLOUD_INIT_CLOUD_INIT_SOURCE="./cloud-init_all.deb" tox -e integration-tests -- tests/integration_tests/modules/test_hotplug.py::test_multi_nic_hotplug_vpc

Merge type

  • Squash merge using "Proposed Commit Message"
  • Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)

@github-actions github-actions bot added the documentation This Pull Request changes documentation label Jan 31, 2025
@holmanb holmanb force-pushed the holmanb/ec2-hotplug-fix branch from 5322b93 to 2ee22f9 Compare January 31, 2025 19:09
@holmanb
fix: retry AWS hotplug for async IMDS
b817a67 
Make tests more robust to temporary network failure.
Document hotplug limitations.

Fixes canonicalGH-5373
@holmanb holmanb force-pushed the holmanb/ec2-hotplug-fix branch from 2ee22f9 to b817a67 Compare January 31, 2025 19:10
TheRealFalcon
TheRealFalcon requested changes Jan 31, 2025
View reviewed changes
Copy link
Member

@TheRealFalcon TheRealFalcon left a comment

Choose a reason for hiding this comment

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

Generally LGTM assuming the testing passes. I left some very minor comments inline.

tests/integration_tests/modules/test_hotplug.py Outdated Show resolved Hide resolved
cloudinit/cmd/devel/hotplug_hook.py Outdated Show resolved Hide resolved
cloudinit/cmd/devel/hotplug_hook.py Outdated Show resolved Hide resolved
cloudinit/cmd/devel/hotplug_hook.py Outdated Show resolved Hide resolved
@holmanb holmanb requested a review from TheRealFalcon February 3, 2025 16:25
TheRealFalcon
TheRealFalcon approved these changes Feb 3, 2025
View reviewed changes
Copy link
Member

@TheRealFalcon TheRealFalcon left a comment

Choose a reason for hiding this comment

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

LGTM!

@holmanb holmanb merged commit d75840b into canonical:main Feb 3, 2025
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheRealFalcon TheRealFalcon TheRealFalcon approved these changes

Assignees
No one assigned
Labels
documentation This Pull Request changes documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@holmanb @TheRealFalcon