Skip to content

nodeup: include Ubuntu in markSecondaryENIsUnmanaged guard#18565

Open
ADoggg9 wants to merge 1 commit into
kubernetes:masterfrom
ADoggg9:nodeup/ubuntu-secondary-eni-unmanaged
Open

nodeup: include Ubuntu in markSecondaryENIsUnmanaged guard#18565
ADoggg9 wants to merge 1 commit into
kubernetes:masterfrom
ADoggg9:nodeup/ubuntu-secondary-eni-unmanaged

Conversation

@ADoggg9

@ADoggg9 ADoggg9 commented Jul 9, 2026

Copy link
Copy Markdown

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

@kubernetes-prow kubernetes-prow Bot added the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Jul 9, 2026
@linux-foundation-easycla

linux-foundation-easycla Bot commented Jul 9, 2026

Copy link
Copy Markdown

CLA Signed
The committers listed above are authorized under a signed CLA.

  • ✅ login: ADoggg9 / name: ADoggg9 (13594ac)

@kubernetes-prow kubernetes-prow Bot requested a review from hakman July 9, 2026 07:47
@kubernetes-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign hakman for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubernetes-prow kubernetes-prow Bot requested a review from zetaab July 9, 2026 07:47
@kubernetes-prow

Copy link
Copy Markdown
Contributor

Welcome @ADoggg9!

It looks like this is your first PR to kubernetes/kops 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kops has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@kubernetes-prow kubernetes-prow Bot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 9, 2026
@kubernetes-prow

Copy link
Copy Markdown
Contributor

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 /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions 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.

@ADoggg9 ADoggg9 changed the title nodeup: include Ubuntu in markSecondaryENIsUnmanaged guard Nodeup: include Ubuntu in markSecondaryENIsUnmanaged guard Jul 9, 2026
@ADoggg9 ADoggg9 force-pushed the nodeup/ubuntu-secondary-eni-unmanaged branch from b9fb06f to 13594ac Compare July 9, 2026 08:00
@kubernetes-prow kubernetes-prow Bot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jul 9, 2026
@ADoggg9 ADoggg9 force-pushed the nodeup/ubuntu-secondary-eni-unmanaged branch from 13594ac to 83d1be3 Compare July 9, 2026 09:43
@kubernetes-prow kubernetes-prow Bot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Jul 9, 2026
@ADoggg9 ADoggg9 changed the title Nodeup: include Ubuntu in markSecondaryENIsUnmanaged guard nodeup: include Ubuntu in markSecondaryENIsUnmanaged guard Jul 9, 2026
@hakman

hakman commented Jul 9, 2026

Copy link
Copy Markdown
Member

/cc @rifelpet

@kubernetes-prow kubernetes-prow Bot requested a review from rifelpet July 9, 2026 09:52
@hakman

hakman commented Jul 9, 2026

Copy link
Copy Markdown
Member

/ok-to-test

@kubernetes-prow kubernetes-prow Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 9, 2026
Comment on lines +128 to +129
(dist.IsDebian() && dist.Version() >= 12)) ||
(dist.IsUbuntu() && dist.Version() >= 22.04) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
(dist.IsDebian() && dist.Version() >= 12)) ||
(dist.IsUbuntu() && dist.Version() >= 22.04) {
(dist.IsDebian() && dist.Version() >= 12) ||
(dist.IsUbuntu() && dist.Version() >= 22.04)) {

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

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.
@ADoggg9 ADoggg9 force-pushed the nodeup/ubuntu-secondary-eni-unmanaged branch from 83d1be3 to 4e27477 Compare July 9, 2026 16:06
@ADoggg9

ADoggg9 commented Jul 9, 2026

Copy link
Copy Markdown
Author

@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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/nodeup cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Ubuntu: include Ubuntu in markSecondaryENIsUnmanaged guard (secondary ENIs left DHCP-managed, racing with Cilium / AWS VPC CNI)

2 participants