Skip to content

Automated cherry pick of #17867: Use a different systemd-networkd configuration for AL2023 #17882: Disable cloud-init network hotplug on Ubuntu 24.04 for Cilium and Ama… #17933: Set MACAddressPolicy=none for AWS VPC CNI on AL2023#17935

Merged
k8s-ci-robot merged 3 commits intokubernetes:release-1.34from
rifelpet:automated-cherry-pick-of-#17867-#17882-#17933-origin-release-1.34
Feb 8, 2026

Conversation

@rifelpet
Copy link
Copy Markdown
Member

@rifelpet rifelpet commented Feb 8, 2026

Cherry pick of #17867 #17882 #17933 on release-1.34.

#17867: Use a different systemd-networkd configuration for AL2023
#17882: Disable cloud-init network hotplug on Ubuntu 24.04 for Cilium and Ama…
#17933: Set MACAddressPolicy=none for AWS VPC CNI on AL2023

For details on the cherry pick process, see the cherry pick requests page.


rifelpet and others added 3 commits February 7, 2026 19:40
…zon VPC CNI

On Ubuntu 24.04+, cloud-init network hotplug is enabled by default
(cloud-init PR 4799). This causes cloud-init to reconfigure netplan
when CNIs dynamically attach secondary ENIs, breaking BPF masquerade
and network routing functionality.

This fix disables cloud-init network hotplug by creating a configuration
file at /etc/cloud/cloud.cfg.d/99-disable-network-hotplug.cfg that sets
updates.network.when to only boot-new-instance, preventing cloud-init
from handling hotplug events.
@k8s-ci-robot k8s-ci-robot added this to the v1.34 milestone Feb 8, 2026
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 8, 2026
@k8s-ci-robot k8s-ci-robot added area/nodeup cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 8, 2026
@rifelpet
Copy link
Copy Markdown
Member Author

rifelpet commented Feb 8, 2026

Consolidating all the recent AWS VPC CNI fixes into a 1.34 cherry-pick.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 8, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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

The pull request process is described 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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 8, 2026
@k8s-ci-robot k8s-ci-robot merged commit f6c69bb into kubernetes:release-1.34 Feb 8, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/nodeup cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants