UPSTREAM 1668: Additional data volumes for machines

We now have the ability for a machine to have additional
block devices to be attached.

Here is an example on how to use `additionalBlockDevices`
for adding additional Cinder volumes attached to the server instance:

```yaml
additionalBlockDevices:
- nameSuffix: dbvol1
  size: 50
  volumeType: my-volume-type
  availabilityZone: az0
  tag: database
```

Co-authored-by: Matt Pryor <[email protected]>
Co-authored-by: Emilien Macchi <[email protected]>
(cherry picked from commit 94d9690)

Author: Matt Pryor

api/v1alpha5/conversion.go

@@ -433,3 +433,7 @@ func Convert_v1alpha5_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(
 
 	return nil
 }
+
+func Convert_v1alpha7_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in *infrav1.OpenStackMachineSpec, out *OpenStackMachineSpec, s conversion.Scope) error {
+	return autoConvert_v1alpha7_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in, out, s)
+}

api/v1alpha5/zz_generated.conversion.go

@@ -60,13 +60,12 @@ func restorev1alpha7MachineSpec(previous *infrav1.OpenStackMachineSpec, dst *inf
 	// PropagateUplinkStatus has been added in v1alpha7.
 	// We restore the whole Ports since they are anyway immutable.
 	dst.Ports = previous.Ports
+	dst.AdditionalBlockDevices = previous.AdditionalBlockDevices
 }
 
 func restorev1alpha7Bastion(previous **infrav1.Bastion, dst **infrav1.Bastion) {
-	// PropagateUplinkStatus has been added in v1alpha7.
-	// We restore the whole Ports since they are anyway immutable.
-	if *previous != nil && (*previous).Instance.Ports != nil && *dst != nil && (*dst).Instance.Ports != nil {
-		(*dst).Instance.Ports = (*previous).Instance.Ports
+	if *previous != nil && *dst != nil {
+		restorev1alpha7MachineSpec(&(*previous).Instance, &(*dst).Instance)
 	}
 }
 
@@ -646,3 +645,7 @@ func Convert_v1alpha6_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(
 
 	return nil
 }
+
+func Convert_v1alpha7_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in *infrav1.OpenStackMachineSpec, out *OpenStackMachineSpec, s apiconversion.Scope) error {
+	return autoConvert_v1alpha7_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in, out, s)
+}

api/v1alpha6/conversion.go

@@ -84,6 +84,11 @@ type OpenStackMachineSpec struct {
 	// The volume metadata to boot from
 	RootVolume *RootVolume `json:"rootVolume,omitempty"`
 
+	// AdditionalBlockDevices is a list of specifications for additional block devices to attach to the server instance
+	// +listType=map
+	// +listMapKey=name
+	AdditionalBlockDevices []AdditionalBlockDevice `json:"additionalBlockDevices,omitempty"`
+
 	// The server group to assign the machine to
 	ServerGroupID string `json:"serverGroupID,omitempty"`
 

api/v1alpha6/zz_generated.conversion.go

@@ -163,6 +163,20 @@ type RootVolume struct {
 	AvailabilityZone string `json:"availabilityZone,omitempty"`
 }
 
+type AdditionalBlockDevice struct {
+	// Name of the Cinder volume in the context of a machine.
+	// It will be combined with the machine name to make the actual volume name.
+	Name string `json:"name"`
+	// Size is the size in GB of the volume.
+	Size int `json:"diskSize"`
+	// VolumeType is the volume type of the volume.
+	// If omitted, the default type will be used.
+	VolumeType string `json:"volumeType,omitempty"`
+	// AvailabilityZone is the volume availability zone to create the volume in.
+	// If omitted, the availability zone of the server will be used.
+	AvailabilityZone string `json:"availabilityZone,omitempty"`
+}
+
 // NetworkStatus contains basic information about an existing neutron network.
 type NetworkStatus struct {
 	Name string `json:"name"`

api/v1alpha7/openstackmachine_types.go

@@ -3770,6 +3770,36 @@ spec:
                   instance:
                     description: Instance for the bastion itself
                     properties:
+                      additionalBlockDevices:
+                        description: AdditionalBlockDevices is a list of specifications
+                          for additional block devices to attach to the server instance
+                        items:
+                          properties:
+                            availabilityZone:
+                              description: AvailabilityZone is the volume availability
+                                zone to create the volume in. If omitted, the availability
+                                zone of the server will be used.
+                              type: string
+                            diskSize:
+                              description: Size is the size in GB of the volume.
+                              type: integer
+                            name:
+                              description: Name of the Cinder volume in the context
+                                of a machine. It will be combined with the machine
+                                name to make the actual volume name.
+                              type: string
+                            volumeType:
+                              description: VolumeType is the volume type of the volume.
+                                If omitted, the default type will be used.
+                              type: string
+                          required:
+                          - diskSize
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
                       cloudName:
                         description: The name of the cloud to use from the clouds
                           secret

api/v1alpha7/types.go

@@ -1610,6 +1610,40 @@ spec:
                           instance:
                             description: Instance for the bastion itself
                             properties:
+                              additionalBlockDevices:
+                                description: AdditionalBlockDevices is a list of specifications
+                                  for additional block devices to attach to the server
+                                  instance
+                                items:
+                                  properties:
+                                    availabilityZone:
+                                      description: AvailabilityZone is the volume
+                                        availability zone to create the volume in.
+                                        If omitted, the availability zone of the server
+                                        will be used.
+                                      type: string
+                                    diskSize:
+                                      description: Size is the size in GB of the volume.
+                                      type: integer
+                                    name:
+                                      description: Name of the Cinder volume in the
+                                        context of a machine. It will be combined
+                                        with the machine name to make the actual volume
+                                        name.
+                                      type: string
+                                    volumeType:
+                                      description: VolumeType is the volume type of
+                                        the volume. If omitted, the default type will
+                                        be used.
+                                      type: string
+                                  required:
+                                  - diskSize
+                                  - name
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - name
+                                x-kubernetes-list-type: map
                               cloudName:
                                 description: The name of the cloud to use from the
                                   clouds secret

api/v1alpha7/zz_generated.deepcopy.go

@@ -1159,6 +1159,36 @@ spec:
           spec:
             description: OpenStackMachineSpec defines the desired state of OpenStackMachine.
             properties:
+              additionalBlockDevices:
+                description: AdditionalBlockDevices is a list of specifications for
+                  additional block devices to attach to the server instance
+                items:
+                  properties:
+                    availabilityZone:
+                      description: AvailabilityZone is the volume availability zone
+                        to create the volume in. If omitted, the availability zone
+                        of the server will be used.
+                      type: string
+                    diskSize:
+                      description: Size is the size in GB of the volume.
+                      type: integer
+                    name:
+                      description: Name of the Cinder volume in the context of a machine.
+                        It will be combined with the machine name to make the actual
+                        volume name.
+                      type: string
+                    volumeType:
+                      description: VolumeType is the volume type of the volume. If
+                        omitted, the default type will be used.
+                      type: string
+                  required:
+                  - diskSize
+                  - name
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
               cloudName:
                 description: The name of the cloud to use from the clouds secret
                 type: string

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

@@ -958,6 +958,36 @@ spec:
                     description: Spec is the specification of the desired behavior
                       of the machine.
                     properties:
+                      additionalBlockDevices:
+                        description: AdditionalBlockDevices is a list of specifications
+                          for additional block devices to attach to the server instance
+                        items:
+                          properties:
+                            availabilityZone:
+                              description: AvailabilityZone is the volume availability
+                                zone to create the volume in. If omitted, the availability
+                                zone of the server will be used.
+                              type: string
+                            diskSize:
+                              description: Size is the size in GB of the volume.
+                              type: integer
+                            name:
+                              description: Name of the Cinder volume in the context
+                                of a machine. It will be combined with the machine
+                                name to make the actual volume name.
+                              type: string
+                            volumeType:
+                              description: VolumeType is the volume type of the volume.
+                                If omitted, the default type will be used.
+                              type: string
+                          required:
+                          - diskSize
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
                       cloudName:
                         description: The name of the cloud to use from the clouds
                           secret

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

@@ -455,17 +455,18 @@ func (r *OpenStackMachineReconciler) getOrCreate(logger logr.Logger, cluster *cl
 
 func machineToInstanceSpec(openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine, userData string) *compute.InstanceSpec {
 	instanceSpec := compute.InstanceSpec{
-		Name:          openStackMachine.Name,
-		Image:         openStackMachine.Spec.Image,
-		ImageUUID:     openStackMachine.Spec.ImageUUID,
-		Flavor:        openStackMachine.Spec.Flavor,
-		SSHKeyName:    openStackMachine.Spec.SSHKeyName,
-		UserData:      userData,
-		Metadata:      openStackMachine.Spec.ServerMetadata,
-		ConfigDrive:   openStackMachine.Spec.ConfigDrive != nil && *openStackMachine.Spec.ConfigDrive,
-		RootVolume:    openStackMachine.Spec.RootVolume,
-		ServerGroupID: openStackMachine.Spec.ServerGroupID,
-		Trunk:         openStackMachine.Spec.Trunk,
+		Name:                   openStackMachine.Name,
+		Image:                  openStackMachine.Spec.Image,
+		ImageUUID:              openStackMachine.Spec.ImageUUID,
+		Flavor:                 openStackMachine.Spec.Flavor,
+		SSHKeyName:             openStackMachine.Spec.SSHKeyName,
+		UserData:               userData,
+		Metadata:               openStackMachine.Spec.ServerMetadata,
+		ConfigDrive:            openStackMachine.Spec.ConfigDrive != nil && *openStackMachine.Spec.ConfigDrive,
+		RootVolume:             openStackMachine.Spec.RootVolume,
+		AdditionalBlockDevices: openStackMachine.Spec.AdditionalBlockDevices,
+		ServerGroupID:          openStackMachine.Spec.ServerGroupID,
+		Trunk:                  openStackMachine.Spec.Trunk,
 	}
 
 	// Add the failure domain only if specified