enabled hotplug for sss bootvolume and made volumes property optional

ionos-cloud · Sep 17, 2024 · da0e11a · da0e11a
1 parent 086ec6c
commit da0e11a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 22 deletions.
diff --git a/apis/compute/v1alpha1/statefulserverset_types.go b/apis/compute/v1alpha1/statefulserverset_types.go
@@ -108,11 +108,12 @@ type StatefulServerSetParameters struct {
 	// on which the server will be created.
 	//
 	// +kubebuilder:validation:Required
-	DatacenterCfg      DatacenterConfig          `json:"datacenterConfig"`
-	Template           ServerSetTemplate         `json:"template"`
-	BootVolumeTemplate BootVolumeTemplate        `json:"bootVolumeTemplate"`
-	Lans               []StatefulServerSetLan    `json:"lans"`
-	Volumes            []StatefulServerSetVolume `json:"volumes"`
+	DatacenterCfg      DatacenterConfig       `json:"datacenterConfig"`
+	Template           ServerSetTemplate      `json:"template"`
+	BootVolumeTemplate BootVolumeTemplate     `json:"bootVolumeTemplate"`
+	Lans               []StatefulServerSetLan `json:"lans"`
+	// +kubebuilder:validation:Optional
+	Volumes []StatefulServerSetVolume `json:"volumes"`
 	// IdentityConfigMap is the configMap from which the identity of the ACTIVE server in the ServerSet is read. The configMap
 	// should be created separately. The stateful serverset only reads the status from it. If it does not find it, it sets
 	// the first server as the ACTIVE.

diff --git a/internal/controller/compute/statefulserverset/datavolume_controller.go b/internal/controller/compute/statefulserverset/datavolume_controller.go
@@ -141,11 +141,12 @@ func fromSSSetToVolume(cr *v1alpha1.StatefulServerSet, name string, replicaIndex
 				DeletionPolicy:          cr.GetDeletionPolicy(),
 			},
 			ForProvider: v1alpha1.VolumeParameters{
-				DatacenterCfg:    cr.Spec.ForProvider.DatacenterCfg,
-				Name:             generateProviderNameFromIndex(cr.Spec.ForProvider.Volumes[volumeIndex].Metadata.Name, volumeIndex),
-				AvailabilityZone: serverset.GetZoneFromIndex(replicaIndex),
-				Size:             cr.Spec.ForProvider.Volumes[volumeIndex].Spec.Size,
-				Type:             cr.Spec.ForProvider.Volumes[volumeIndex].Spec.Type,
+				DatacenterCfg:     cr.Spec.ForProvider.DatacenterCfg,
+				Name:              generateProviderNameFromIndex(cr.Spec.ForProvider.Volumes[volumeIndex].Metadata.Name, volumeIndex),
+				AvailabilityZone:  serverset.GetZoneFromIndex(replicaIndex),
+				Size:              cr.Spec.ForProvider.Volumes[volumeIndex].Spec.Size,
+				Type:              cr.Spec.ForProvider.Volumes[volumeIndex].Spec.Type,
+				DiscVirtioHotPlug: true,
 			},
 		}}
 	if cr.Spec.ForProvider.Volumes[volumeIndex].Spec.Image != "" {

diff --git a/internal/controller/serverset/bootvolume_controller.go b/internal/controller/serverset/bootvolume_controller.go
@@ -216,13 +216,14 @@ func fromServerSetToVolume(cr *v1alpha1.ServerSet, name string, replicaIndex, ve
 				DeletionPolicy:          cr.GetDeletionPolicy(),
 			},
 			ForProvider: v1alpha1.VolumeParameters{
-				DatacenterCfg:    cr.Spec.ForProvider.DatacenterCfg,
-				Name:             name,
-				AvailabilityZone: GetZoneFromIndex(replicaIndex),
-				Size:             cr.Spec.ForProvider.BootVolumeTemplate.Spec.Size,
-				Type:             cr.Spec.ForProvider.BootVolumeTemplate.Spec.Type,
-				Image:            cr.Spec.ForProvider.BootVolumeTemplate.Spec.Image,
-				UserData:         cr.Spec.ForProvider.BootVolumeTemplate.Spec.UserData,
+				DatacenterCfg:     cr.Spec.ForProvider.DatacenterCfg,
+				Name:              name,
+				AvailabilityZone:  GetZoneFromIndex(replicaIndex),
+				Size:              cr.Spec.ForProvider.BootVolumeTemplate.Spec.Size,
+				Type:              cr.Spec.ForProvider.BootVolumeTemplate.Spec.Type,
+				Image:             cr.Spec.ForProvider.BootVolumeTemplate.Spec.Image,
+				UserData:          cr.Spec.ForProvider.BootVolumeTemplate.Spec.UserData,
+				DiscVirtioHotPlug: true,
 			},
 		}}
 	if cr.Spec.ForProvider.BootVolumeTemplate.Spec.ImagePassword != "" {

diff --git a/internal/controller/volumeselector/volumeselector.go b/internal/controller/volumeselector/volumeselector.go
@@ -228,10 +228,10 @@ func (c *externalVolumeselector) attachVolume(ctx context.Context, datacenterID,
 }
 
 func (c *externalVolumeselector) areVolumesAndServersReady(volumeList v1alpha1.VolumeList, serverList v1alpha1.ServerList) bool {
-	if len(volumeList.Items) == 0 {
-		c.log.Info("volumeselector no Volumes found")
-		return false
-	}
+	//if len(volumeList.Items) == 0 {
+	//	c.log.Info("volumeselector no Volumes found")
+	//	return false
+	//}
 	if len(serverList.Items) == 0 {
 		c.log.Info("volumeselector no Servers found")
 		return false

diff --git a/package/crds/compute.ionoscloud.crossplane.io_statefulserversets.yaml b/package/crds/compute.ionoscloud.crossplane.io_statefulserversets.yaml
@@ -597,7 +597,6 @@ spec:
                 - lans
                 - replicas
                 - template
-                - volumes
                 type: object
               managementPolicies:
                 default: