fix azure non spot

Author: DavidGOrtega

examples/main.tf

@@ -0,0 +1,42 @@
+terraform {
+  required_providers {
+    iterative = {
+      versions = ["0.6"]
+      source = "github.com/iterative/iterative"
+    }
+
+    # iterative = {
+    #   source = "iterative/iterative"
+    #   version = "0.5.7"
+    # }
+  }
+}
+
+provider "iterative" {}
+
+
+resource "iterative_cml_runner" "runner-gl-aws" {
+    name = "gitlabrunner2"
+    token = "arszDpb3xtNdKaXmQ6vN"
+    repo = "https://gitlab.com/DavidGOrtega/3_tensorboard"
+    driver = "gitlab"
+    labels = "tf"
+
+    cloud = "azure"
+    region = "us-west"
+    instance_type = "m"
+    spot = true
+    #spot_price = 0.09
+} 
+
+# resource "iterative_cml_runner" "runner-gh-aws" {
+#     name = "githubrunner2"
+#     token = "a0b56d03294f0908f4ee7290be2ea53051d227d3"
+#     repo = "https://github.com/DavidGOrtega/3_tensorboard"
+#     driver = "github"
+#     labels = "tf"
+
+#     cloud = "aws"
+#     region = "us-east-2"
+#     instance_type = "t2.micro"
+# } 

iterative/azure/provider.go

@@ -29,10 +29,6 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 	hddSize := int32(d.Get("instance_hdd_size").(int))
 	spot := d.Get("spot").(bool)
 	spotPrice := d.Get("spot_price").(float64)
-	vmPriority := compute.Regular
-	if spot {
-		vmPriority = compute.Spot
-	}
 
 	image := d.Get("image").(string)
 	if image == "" {
@@ -187,66 +183,70 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 	}
 
 	vmClient, _ := getVMClient(subscriptionID)
-	futureVM, err := vmClient.CreateOrUpdate(
-		ctx,
-		gpName,
-		vmName,
-		compute.VirtualMachine{
-
-			Location: to.StringPtr(region),
-			VirtualMachineProperties: &compute.VirtualMachineProperties{
-				EvictionPolicy: compute.Delete,
-				Priority:       vmPriority,
-				BillingProfile: &compute.BillingProfile{
-					MaxPrice: to.Float64Ptr(spotPrice),
-				},
-				HardwareProfile: &compute.HardwareProfile{
-					VMSize: compute.VirtualMachineSizeTypes(instanceType),
+	vmSettings := compute.VirtualMachine{
+		Location: to.StringPtr(region),
+		VirtualMachineProperties: &compute.VirtualMachineProperties{
+			HardwareProfile: &compute.HardwareProfile{
+				VMSize: compute.VirtualMachineSizeTypes(instanceType),
+			},
+			StorageProfile: &compute.StorageProfile{
+				ImageReference: &compute.ImageReference{
+					Publisher: to.StringPtr(publisher),
+					Offer:     to.StringPtr(offer),
+					Sku:       to.StringPtr(sku),
+					Version:   to.StringPtr(version),
 				},
-				StorageProfile: &compute.StorageProfile{
-					ImageReference: &compute.ImageReference{
-						Publisher: to.StringPtr(publisher),
-						Offer:     to.StringPtr(offer),
-						Sku:       to.StringPtr(sku),
-						Version:   to.StringPtr(version),
-					},
-					OsDisk: &compute.OSDisk{
-						Name:         to.StringPtr(fmt.Sprintf(vmName + "-hdd")),
-						Caching:      compute.CachingTypesReadWrite,
-						CreateOption: compute.DiskCreateOptionTypesFromImage,
-						DiskSizeGB:   to.Int32Ptr(hddSize),
-						ManagedDisk: &compute.ManagedDiskParameters{
-							StorageAccountType: compute.StorageAccountTypesStandardLRS,
-						},
+				OsDisk: &compute.OSDisk{
+					Name:         to.StringPtr(fmt.Sprintf(vmName + "-hdd")),
+					Caching:      compute.CachingTypesReadWrite,
+					CreateOption: compute.DiskCreateOptionTypesFromImage,
+					DiskSizeGB:   to.Int32Ptr(hddSize),
+					ManagedDisk: &compute.ManagedDiskParameters{
+						StorageAccountType: compute.StorageAccountTypesStandardLRS,
 					},
 				},
-				OsProfile: &compute.OSProfile{
-					CustomData:    to.StringPtr(customData),
-					ComputerName:  to.StringPtr("iterative"),
-					AdminUsername: to.StringPtr(username),
-					LinuxConfiguration: &compute.LinuxConfiguration{
-						SSH: &compute.SSHConfiguration{
-							PublicKeys: &[]compute.SSHPublicKey{
-								{
-									Path:    to.StringPtr(fmt.Sprintf("/home/%s/.ssh/authorized_keys", username)),
-									KeyData: to.StringPtr(keyPublic),
-								},
+			},
+			OsProfile: &compute.OSProfile{
+				CustomData:    to.StringPtr(customData),
+				ComputerName:  to.StringPtr("iterative"),
+				AdminUsername: to.StringPtr(username),
+				LinuxConfiguration: &compute.LinuxConfiguration{
+					SSH: &compute.SSHConfiguration{
+						PublicKeys: &[]compute.SSHPublicKey{
+							{
+								Path:    to.StringPtr(fmt.Sprintf("/home/%s/.ssh/authorized_keys", username)),
+								KeyData: to.StringPtr(keyPublic),
 							},
 						},
 					},
 				},
-				NetworkProfile: &compute.NetworkProfile{
-					NetworkInterfaces: &[]compute.NetworkInterfaceReference{
-						{
-							ID: nic.ID,
-							NetworkInterfaceReferenceProperties: &compute.NetworkInterfaceReferenceProperties{
-								Primary: to.BoolPtr(true),
-							},
+			},
+			NetworkProfile: &compute.NetworkProfile{
+				NetworkInterfaces: &[]compute.NetworkInterfaceReference{
+					{
+						ID: nic.ID,
+						NetworkInterfaceReferenceProperties: &compute.NetworkInterfaceReferenceProperties{
+							Primary: to.BoolPtr(true),
 						},
 					},
 				},
 			},
 		},
+	}
+
+	if spot {
+		vmSettings.EvictionPolicy = compute.Delete
+		vmSettings.Priority = compute.Spot
+		vmSettings.BillingProfile = &compute.BillingProfile{
+			MaxPrice: to.Float64Ptr(spotPrice),
+		}
+	}
+
+	futureVM, err := vmClient.CreateOrUpdate(
+		ctx,
+		gpName,
+		vmName,
+		vmSettings,
 	)
 	if err != nil {
 		return err