Proper ignore IPv6 announcements when IPv6 is not requested

vmware-tanzu · Jan 31, 2025 · 489b564 · 489b564
1 parent bdd2b91
commit 489b564
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/pkg/providers/vsphere/network/netplan.go b/pkg/providers/vsphere/network/netplan.go
@@ -33,6 +33,9 @@ func NetPlanCustomization(result NetworkInterfaceResults) (*netplan.Network, err
 
 		npEth.Dhcp4 = &r.DHCP4
 		npEth.Dhcp6 = &r.DHCP6
+		// Right now we can set the same value as DHCPv6 configuration
+		// and in some future separate/specialize if required
+		npEth.AcceptRa = &r.DHCP6
 
 		if !*npEth.Dhcp4 {
 			for i := range r.IPConfigs {

diff --git a/pkg/providers/vsphere/network/netplan_test.go b/pkg/providers/vsphere/network/netplan_test.go
@@ -97,6 +97,7 @@ var _ = Describe("Netplan", func() {
 				Expect(*np.SetName).To(Equal(guestDevName))
 				Expect(*np.Dhcp4).To(BeFalse())
 				Expect(*np.Dhcp6).To(BeFalse())
+				Expect(*np.AcceptRa).To(BeFalse())
 				Expect(np.Addresses).To(HaveLen(2))
 				Expect(np.Addresses[0]).To(Equal(netplan.Address{String: ptr.To(ipv4CIDR)}))
 				Expect(np.Addresses[1]).To(Equal(netplan.Address{String: ptr.To(ipv6 + fmt.Sprintf("/%d", ipv6Subnet))}))
@@ -142,6 +143,7 @@ var _ = Describe("Netplan", func() {
 				Expect(*np.SetName).To(Equal(guestDevName))
 				Expect(*np.Dhcp4).To(BeTrue())
 				Expect(*np.Dhcp6).To(BeTrue())
+				Expect(*np.AcceptRa).To(BeTrue())
 				Expect(*np.MTU).To(BeEquivalentTo(9000))
 				Expect(np.Nameservers.Addresses).To(Equal([]string{dnsServer1}))
 				Expect(np.Nameservers.Search).To(Equal([]string{searchDomain1}))