nodeup: include Ubuntu in markSecondaryENIsUnmanaged guard#18565
nodeup: include Ubuntu in markSecondaryENIsUnmanaged guard#18565ADoggg9 wants to merge 1 commit into
Conversation
|
|
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Welcome @ADoggg9! |
|
Hi @ADoggg9. Thanks for your PR. I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with Regular contributors should join the org to skip this step. Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
b9fb06f to
13594ac
Compare
13594ac to
83d1be3
Compare
|
/cc @rifelpet |
|
/ok-to-test |
| (dist.IsDebian() && dist.Version() >= 12)) || | ||
| (dist.IsUbuntu() && dist.Version() >= 22.04) { |
There was a problem hiding this comment.
| (dist.IsDebian() && dist.Version() >= 12)) || | |
| (dist.IsUbuntu() && dist.Version() >= 22.04) { | |
| (dist.IsDebian() && dist.Version() >= 12) || | |
| (dist.IsUbuntu() && dist.Version() >= 22.04)) { |
There was a problem hiding this comment.
Good catch — fixed in <4e27477d>. Thanks!
Add Ubuntu >= 22.04 to the guard clause so kops writes the Unmanaged=yes .network file for secondary ENIs on Ubuntu, mirroring the existing AL2023 / Debian 12+ handling. Without this, systemd-networkd keeps DHCP-ing on secondary ENIs managed by Cilium / AWS VPC CNI.
83d1be3 to
4e27477
Compare
|
@hakman hi,noticed nodeup/pkg/model/networking has no _test.go files today. Bootstrapping a test file from scratch (figuring out fi.NodeupModelBuilderContext construction + File task assertions) feels out of scope for this XS guard fix. If you want Ubuntu 22.04/24.04 test coverage, I'd prefer a separate follow-up PR — keep this one focused on the guard fix. Fine either way, let me know. |
nodeup: include Ubuntu in markSecondaryENIsUnmanaged guard
Add Ubuntu >= 22.04 to the guard clause so kops writes the
Unmanaged=yes .network file for secondary ENIs on Ubuntu, mirroring
the existing AL2023 / Debian 12+ handling. Without this, systemd-networkd
keeps DHCP-ing on secondary ENIs managed by Cilium / AWS VPC CNI.
Fixes #18564