feat: implement setting mtu for virtio network device

See https://git.proxmox.com/?p=qemu-server.git;a=commit;h=61a14cde8d568e552d3deaab2da76b479b8aca7b
ionos-cloud · Dec 17, 2023 · 7b6b2e7 · 7b6b2e7
1 parent a1666e4
commit 7b6b2e7
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 7 deletions.
diff --git a/api/v1alpha1/proxmoxmachine_types.go b/api/v1alpha1/proxmoxmachine_types.go
@@ -216,6 +216,13 @@ type NetworkDevice struct {
 	// +kubebuilder:validation:Enum=e1000;virtio;rtl8139;vmxnet3
 	// +kubebuilder:default=virtio
 	Model *string `json:"model,omitempty"`
+
+	// MTU is the network device Maximum Transmission Unit.
+	// Only works with virtio Model.
+	// +optional
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:default=1500
+	MTU *uint16 `json:"mtu,omitempty"`
 }
 
 // AdditionalNetworkDevice the definition of a Proxmox network device.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxmachines.yaml
@@ -205,6 +205,12 @@ spec:
                           - rtl8139
                           - vmxnet3
                           type: string
+                        mtu:
+                          default: 1500
+                          description: MTU is the network device Maximum Transmission
+                            Unit. Only works with virtio Model.
+                          minimum: 1
+                          type: integer
                         name:
                           description: Name is the network device name. must be unique
                             within the virtual machine and different from the primary
@@ -245,6 +251,12 @@ spec:
                         - rtl8139
                         - vmxnet3
                         type: string
+                      mtu:
+                        default: 1500
+                        description: MTU is the network device Maximum Transmission
+                          Unit. Only works with virtio Model.
+                        minimum: 1
+                        type: integer
                     required:
                     - bridge
                     type: object

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxmachinetemplates.yaml
@@ -223,6 +223,12 @@ spec:
                                   - rtl8139
                                   - vmxnet3
                                   type: string
+                                mtu:
+                                  default: 1500
+                                  description: MTU is the network device Maximum Transmission
+                                    Unit. Only works with virtio Model.
+                                  minimum: 1
+                                  type: integer
                                 name:
                                   description: Name is the network device name. must
                                     be unique within the virtual machine and different
@@ -265,6 +271,12 @@ spec:
                                 - rtl8139
                                 - vmxnet3
                                 type: string
+                              mtu:
+                                default: 1500
+                                description: MTU is the network device Maximum Transmission
+                                  Unit. Only works with virtio Model.
+                                minimum: 1
+                                type: integer
                             required:
                             - bridge
                             type: object

diff --git a/internal/service/vmservice/utils.go b/internal/service/vmservice/utils.go
@@ -103,8 +103,8 @@ func shouldUpdateNetworkDevices(machineScope *scope.MachineScope) bool {
 
 // formatNetworkDevice formats a network device config
 // example 'virtio,bridge=vmbr0'.
-func formatNetworkDevice(model, bridge string) string {
-	return fmt.Sprintf("%s,bridge=%s", model, bridge)
+func formatNetworkDevice(model, bridge string, mtu uint16) string {
+	return fmt.Sprintf("%s,bridge=%s,mtu=%d", model, bridge, mtu)
 }
 
 // extractMACAddress returns the macaddress out of net device input e.g. virtio=A6:23:64:4D:84:CB,bridge=vmbr1.

diff --git a/internal/service/vmservice/vm.go b/internal/service/vmservice/vm.go
@@ -191,16 +191,20 @@ func reconcileVirtualMachineConfig(ctx context.Context, machineScope *scope.Mach
 	if machineScope.ProxmoxMachine.Spec.Network != nil && shouldUpdateNetworkDevices(machineScope) {
 		// adding the default network device.
 		vmOptions = append(vmOptions, proxmox.VirtualMachineOption{
-			Name:  infrav1alpha1.DefaultNetworkDevice,
-			Value: formatNetworkDevice(*machineScope.ProxmoxMachine.Spec.Network.Default.Model, machineScope.ProxmoxMachine.Spec.Network.Default.Bridge),
+			Name: infrav1alpha1.DefaultNetworkDevice,
+			Value: formatNetworkDevice(
+				*machineScope.ProxmoxMachine.Spec.Network.Default.Model,
+				machineScope.ProxmoxMachine.Spec.Network.Default.Bridge,
+				*machineScope.ProxmoxMachine.Spec.Network.Default.MTU,
+			),
 		})
 
 		// handing additional network devices.
 		devices := machineScope.ProxmoxMachine.Spec.Network.AdditionalDevices
 		for _, v := range devices {
 			vmOptions = append(vmOptions, proxmox.VirtualMachineOption{
 				Name:  v.Name,
-				Value: formatNetworkDevice(*v.Model, v.Bridge),
+				Value: formatNetworkDevice(*v.Model, v.Bridge, *v.MTU),
 			})
 		}
 	}

diff --git a/internal/service/vmservice/vm_test.go b/internal/service/vmservice/vm_test.go
@@ -176,8 +176,8 @@ func TestReconcileVirtualMachineConfig_ApplyConfig(t *testing.T) {
 		proxmox.VirtualMachineOption{Name: optionSockets, Value: machineScope.ProxmoxMachine.Spec.NumSockets},
 		proxmox.VirtualMachineOption{Name: optionCores, Value: machineScope.ProxmoxMachine.Spec.NumCores},
 		proxmox.VirtualMachineOption{Name: optionMemory, Value: machineScope.ProxmoxMachine.Spec.MemoryMiB},
-		proxmox.VirtualMachineOption{Name: "net0", Value: formatNetworkDevice("virtio", "vmbr0")},
-		proxmox.VirtualMachineOption{Name: "net1", Value: formatNetworkDevice("virtio", "vmbr1")},
+		proxmox.VirtualMachineOption{Name: "net0", Value: formatNetworkDevice("virtio", "vmbr0", 1500)},
+		proxmox.VirtualMachineOption{Name: "net1", Value: formatNetworkDevice("virtio", "vmbr1", 1500)},
 	}
 
 	proxmoxClient.EXPECT().ConfigureVM(context.TODO(), vm, expectedOptions...).Return(task, nil).Once()