Skip to content

Conversation

@nmeyerhans
Copy link
Contributor

Issue #, if available: n/a

Description of changes:

Several small improvements:

  • Makefile improvements:
    • scratch-rpm writes the rpms to the current directory.
    • Add scratch-deb
  • CI
    • Add sid jobs
    • Replace Debian 11 with Debian 12
  • Debian packaging: Increase the config priority such that generates configuration is prioritized over that from netplan
  • Code improvements:
    • Retry handling changes
    • Back off between retries

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Noah Meyerhans added 11 commits March 1, 2024 16:07
This shellcheck finding was previously addressed in c71ae5d ("Fix
shellcheck SC2320 warning") but came back up with a subsequent
unrelated commit.

Fixes: b3c7d03 ("Fix a process synchronization issue during ENI removal")
When we're performing a refresh, IMDS has had time to stabilize.  We
can skip most of our retries and abort if IMDS is missing something
that should be there.  Anything we missed will be picked up by the
next trigged execution.
If we're refreshing an interface's config but the corresponding sysfs
node doesn't exist, exit immediately.  It's likely that the device has
been moved to another namespace or removed from the instance
altogether.

Similarly, don't wait for the interface to be online when refreshing
the configuration.
Noah Meyerhans added 3 commits March 6, 2024 11:38
Ensure that our networkd configuration takes priority over what
netplan installs.
Handle a rare IMDS failure mode in which the service returns a 0 value
for both device-number and network-card for an interface that is not
the primary ENI.
@nmeyerhans nmeyerhans marked this pull request as ready for review March 6, 2024 19:40
@nmeyerhans nmeyerhans requested a review from vigh-m March 6, 2024 19:40
@nmeyerhans nmeyerhans added this to the 2.5.0 milestone Mar 6, 2024
Copy link
Contributor

@vigh-m vigh-m left a comment

Choose a reason for hiding this comment

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

LGTM. As discussed, we're not too concerned about exiting in _get_network_card() and triggered the networkd reload trap.

@vigh-m vigh-m merged commit 779468c into amazonlinux:main Mar 6, 2024
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.

2 participants