add support for specifying iops and thoroughput when using hyperdisks

Author: upodroid

pkg/model/gcemodel/autoscalinggroup.go

@@ -94,14 +94,16 @@ func (b *AutoscalingGroupModelBuilder) buildInstanceTemplate(c *fi.CloudupModelB
 			}
 
 			t := &gcetasks.InstanceTemplate{
-				Name:           s(name),
-				NamePrefix:     s(namePrefix),
-				Lifecycle:      b.Lifecycle,
-				Network:        network,
-				MachineType:    s(ig.Spec.MachineType),
-				BootDiskType:   s(volumeType),
-				BootDiskSizeGB: i64(int64(volumeSize)),
-				BootDiskImage:  s(ig.Spec.Image),
+				Name:               s(name),
+				NamePrefix:         s(namePrefix),
+				Lifecycle:          b.Lifecycle,
+				Network:            network,
+				MachineType:        s(ig.Spec.MachineType),
+				BootDiskType:       s(volumeType),
+				BootDiskSizeGB:     i64(int64(volumeSize)),
+				BootDiskImage:      s(ig.Spec.Image),
+				BootDiskIOPS:       fi.PtrTo(int64(fi.ValueOf(ig.Spec.RootVolume.IOPS))),
+				BootDiskThroughput: fi.PtrTo(int64(fi.ValueOf(ig.Spec.RootVolume.Throughput))),
 
 				Preemptible:          fi.PtrTo(fi.ValueOf(ig.Spec.GCPProvisioningModel) == "SPOT"),
 				GCPProvisioningModel: ig.Spec.GCPProvisioningModel,

upup/pkg/fi/cloudup/gcetasks/disk.go

@@ -35,10 +35,12 @@ type Disk struct {
 	Name      *string
 	Lifecycle fi.Lifecycle
 
-	VolumeType *string
-	SizeGB     *int64
-	Zone       *string
-	Labels     map[string]string
+	VolumeType       *string
+	SizeGB           *int64
+	VolumeIops       *int64
+	VolumeThroughput *int64
+	Zone             *string
+	Labels           map[string]string
 }
 
 var _ fi.CompareWithID = &Disk{}
@@ -63,6 +65,8 @@ func (e *Disk) Find(c *fi.CloudupContext) (*Disk, error) {
 	actual.VolumeType = fi.PtrTo(gce.LastComponent(r.Type))
 	actual.Zone = fi.PtrTo(gce.LastComponent(r.Zone))
 	actual.SizeGB = &r.SizeGb
+	actual.VolumeIops = &r.ProvisionedIops
+	actual.VolumeThroughput = &r.ProvisionedThroughput
 
 	actual.Labels = r.Labels
 
@@ -86,7 +90,7 @@ func (e *Disk) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *Disk) CheckChanges(a, e, changes *Disk) error {
+func (*Disk) CheckChanges(a, e, changes *Disk) error {
 	if a != nil {
 		if changes.SizeGB != nil {
 			return fi.CannotChangeField("SizeGB")
@@ -105,17 +109,19 @@ func (_ *Disk) CheckChanges(a, e, changes *Disk) error {
 	return nil
 }
 
-func (_ *Disk) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Disk) error {
+func (*Disk) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Disk) error {
 	cloud := t.Cloud
 	typeURL := fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/zones/%s/diskTypes/%s",
 		cloud.Project(),
 		*e.Zone,
 		*e.VolumeType)
 
 	disk := &compute.Disk{
-		Name:   *e.Name,
-		SizeGb: *e.SizeGB,
-		Type:   typeURL,
+		Name:                  *e.Name,
+		SizeGb:                *e.SizeGB,
+		Type:                  typeURL,
+		ProvisionedIops:       *e.VolumeIops,
+		ProvisionedThroughput: *e.VolumeThroughput,
 	}
 
 	if a == nil {
@@ -164,26 +170,30 @@ func (_ *Disk) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Disk) error {
 }
 
 type terraformDisk struct {
-	Name       *string           `cty:"name"`
-	VolumeType *string           `cty:"type"`
-	SizeGB     *int64            `cty:"size"`
-	Zone       *string           `cty:"zone"`
-	Labels     map[string]string `cty:"labels"`
+	Name                  *string           `cty:"name"`
+	VolumeType            *string           `cty:"type"`
+	SizeGB                *int64            `cty:"size"`
+	ProvisionedIops       *int64            `cty:"provisioned_iops"`
+	ProvisionedThroughput *int64            `cty:"provisioned_throughput"`
+	Zone                  *string           `cty:"zone"`
+	Labels                map[string]string `cty:"labels"`
 }
 
-func (_ *Disk) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Disk) error {
+func (*Disk) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Disk) error {
 	cloud := t.Cloud.(gce.GCECloud)
 
 	labels := make(map[string]string)
 	maps.Copy(labels, cloud.Labels())
 	maps.Copy(labels, e.Labels)
 
 	tf := &terraformDisk{
-		Name:       e.Name,
-		VolumeType: e.VolumeType,
-		SizeGB:     e.SizeGB,
-		Zone:       e.Zone,
-		Labels:     labels,
+		Name:                  e.Name,
+		VolumeType:            e.VolumeType,
+		SizeGB:                e.SizeGB,
+		ProvisionedIops:       e.VolumeIops,
+		ProvisionedThroughput: e.VolumeThroughput,
+		Zone:                  e.Zone,
+		Labels:                labels,
 	}
 	return t.RenderResource("google_compute_disk", *e.Name, tf)
 }

upup/pkg/fi/cloudup/gcetasks/instancetemplate.go

@@ -57,9 +57,11 @@ type InstanceTemplate struct {
 	Preemptible          *bool
 	GCPProvisioningModel *string
 
-	BootDiskImage  *string
-	BootDiskSizeGB *int64
-	BootDiskType   *string
+	BootDiskImage      *string
+	BootDiskSizeGB     *int64
+	BootDiskType       *string
+	BootDiskIOPS       *int64
+	BootDiskThroughput *int64
 
 	CanIPForward  *bool
 	Subnet        *Subnet
@@ -133,6 +135,8 @@ func (e *InstanceTemplate) Find(c *fi.CloudupContext) (*InstanceTemplate, error)
 		actual.BootDiskImage = fi.PtrTo(bootDiskImage)
 		actual.BootDiskType = &p.Disks[0].InitializeParams.DiskType
 		actual.BootDiskSizeGB = &p.Disks[0].InitializeParams.DiskSizeGb
+		actual.BootDiskIOPS = &p.Disks[0].InitializeParams.ProvisionedIops
+		actual.BootDiskThroughput = &p.Disks[0].InitializeParams.ProvisionedThroughput
 
 		if p.Scheduling != nil {
 			actual.Preemptible = &p.Scheduling.Preemptible
@@ -279,9 +283,11 @@ func (e *InstanceTemplate) mapToGCE(project string, region string) (*compute.Ins
 	disks = append(disks, &compute.AttachedDisk{
 		Kind: "compute#attachedDisk",
 		InitializeParams: &compute.AttachedDiskInitializeParams{
-			SourceImage: BuildImageURL(project, *e.BootDiskImage),
-			DiskSizeGb:  *e.BootDiskSizeGB,
-			DiskType:    *e.BootDiskType,
+			SourceImage:           BuildImageURL(project, *e.BootDiskImage),
+			DiskSizeGb:            *e.BootDiskSizeGB,
+			DiskType:              *e.BootDiskType,
+			ProvisionedIops:       *e.BootDiskIOPS,
+			ProvisionedThroughput: *e.BootDiskThroughput,
 		},
 		Boot:       true,
 		DeviceName: "persistent-disks-0",