sed default via crd definition instead via controller

Author: sp-yduck

api/v1beta1/proxmoxmachine_types.go

@@ -53,7 +53,8 @@ type ProxmoxMachineSpec struct {
 	CloudInit CloudInit `json:"cloudInit,omitempty"`
 
 	// Hardware
-	Hardware Hardware `json:"hardware,omitempty"`
+	// +kubebuilder:default:={cpu:2,disk:"50G",memory:4096,networkDevice:{model:virtio,bridge:vmbr0}}
+	Hardware Hardware `json:"hardware"`
 
 	// Network
 	Network Network `json:"network,omitempty"`

api/v1beta1/type.go

@@ -98,16 +98,17 @@ type Hardware struct {
 
 	// network devices
 	// to do: multiple devices
-	NetworkDevice NetworkDevice `json:"networkDevice,omitempty"`
+	// +kubebuilder:default:={model:virtio,bridge:vmbr0}
+	NetworkDevice NetworkDevice `json:"networkDevice"`
 }
 
 // Network Device
 type NetworkDevice struct {
 	// +kubebuilder:default:="virtio"
-	Model NetworkDeviceModel `json:"model,omitempty"`
+	Model NetworkDeviceModel `json:"model"`
 
 	// +kubebuilder:default:="vmbr0"
-	Bridge NetworkDeviceBridge `json:"bridge,omitempty"`
+	Bridge NetworkDeviceBridge `json:"bridge"`
 
 	Firewall bool `json:"firewall,omitempty"`
 

cloud/scope/machine.go

@@ -196,16 +196,6 @@ func (m *MachineScope) GetNetwork() infrav1.Network {
 }
 
 func (m *MachineScope) GetHardware() infrav1.Hardware {
-	// set default value if empty
-	if m.ProxmoxMachine.Spec.Hardware.CPU == 0 {
-		m.ProxmoxMachine.Spec.Hardware.CPU = 2
-	}
-	if m.ProxmoxMachine.Spec.Hardware.Memory == 0 {
-		m.ProxmoxMachine.Spec.Hardware.Memory = 4096
-	}
-	if m.ProxmoxMachine.Spec.Hardware.Disk == "" {
-		m.ProxmoxMachine.Spec.Hardware.Disk = "50G"
-	}
 	return m.ProxmoxMachine.Spec.Hardware
 }
 

config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxmachines.yaml

@@ -219,6 +219,13 @@ spec:
                   this Machine should be attached to, as defined in Cluster API.
                 type: string
               hardware:
+                default:
+                  cpu: 2
+                  disk: 50G
+                  memory: 4096
+                  networkDevice:
+                    bridge: vmbr0
+                    model: virtio
                 description: Hardware
                 properties:
                   bios:
@@ -249,6 +256,9 @@ spec:
                     minimum: 16
                     type: integer
                   networkDevice:
+                    default:
+                      bridge: vmbr0
+                      model: virtio
                     description: 'network devices to do: multiple devices'
                     properties:
                       bridge:
@@ -285,11 +295,16 @@ spec:
                         items:
                           type: integer
                         type: array
+                    required:
+                    - bridge
+                    - model
                     type: object
                   sockets:
                     description: The number of CPU sockets. Defaults to 1.
                     minimum: 1
                     type: integer
+                required:
+                - networkDevice
                 type: object
               image:
                 description: Image is the image to be provisioned
@@ -498,6 +513,7 @@ spec:
                 minimum: 0
                 type: integer
             required:
+            - hardware
             - image
             type: object
           status:

config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxmachinetemplates.yaml

@@ -236,6 +236,13 @@ spec:
                           API.
                         type: string
                       hardware:
+                        default:
+                          cpu: 2
+                          disk: 50G
+                          memory: 4096
+                          networkDevice:
+                            bridge: vmbr0
+                            model: virtio
                         description: Hardware
                         properties:
                           bios:
@@ -266,6 +273,9 @@ spec:
                             minimum: 16
                             type: integer
                           networkDevice:
+                            default:
+                              bridge: vmbr0
+                              model: virtio
                             description: 'network devices to do: multiple devices'
                             properties:
                               bridge:
@@ -302,11 +312,16 @@ spec:
                                 items:
                                   type: integer
                                 type: array
+                            required:
+                            - bridge
+                            - model
                             type: object
                           sockets:
                             description: The number of CPU sockets. Defaults to 1.
                             minimum: 1
                             type: integer
+                        required:
+                        - networkDevice
                         type: object
                       image:
                         description: Image is the image to be provisioned
@@ -522,6 +537,7 @@ spec:
                         minimum: 0
                         type: integer
                     required:
+                    - hardware
                     - image
                     type: object
                 required: