Merge pull request #17398 from rifelpet/vpc-cni-2404

Set MACAddressPolicy=none for Ubuntu 24.04
This commit is contained in:
Kubernetes Prow Robot 2025-05-22 08:28:36 -07:00 committed by GitHub
commit ac053f9c66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions

View File

@ -65,10 +65,11 @@ ManageForeignRoutingPolicyRules=no
})
}
// Running Amazon VPC CNI on Ubuntu 22.04 or any version of al2023 requires
// Running Amazon VPC CNI on Ubuntu 22.04+ or any version of al2023 requires
// setting MACAddressPolicy to `none` (ref: https://github.com/aws/amazon-vpc-cni-k8s/issues/2103
// & https://github.com/aws/amazon-vpc-cni-k8s/issues/2839
// & https://github.com/kubernetes/kops/issues/16255)
if (b.Distribution.IsUbuntu() && b.Distribution.Version() == 22.04) ||
if (b.Distribution.IsUbuntu() && b.Distribution.Version() >= 22.04) ||
b.Distribution == distributions.DistributionAmazonLinux2023 {
contents := `
[Match]