Merge pull request openshift#138 from RadekManak/spot-eviction-delete

OCPBUGS-54617: Update eviction policy for Spot VMs from Deallocate to Delete

Author: openshift-merge-bot[bot]

pkg/cloud/azure/services/virtualmachines/virtualmachines.go

@@ -411,9 +411,7 @@ func getSpotVMOptions(spotVMOptions *machinev1.SpotVMOptions) (compute.VirtualMa
 		}
 	}
 
-	// We should use deallocate eviction policy it's - "the only supported eviction policy for Single Instance Spot VMs"
-	// https://github.com/openshift/enhancements/blob/master/enhancements/machine-api/spot-instances.md#eviction-policies
-	return compute.VirtualMachinePriorityTypesSpot, compute.VirtualMachineEvictionPolicyTypesDeallocate, billingProfile, nil
+	return compute.VirtualMachinePriorityTypesSpot, compute.VirtualMachineEvictionPolicyTypesDelete, billingProfile, nil
 }
 
 func generateImagePlan(image machinev1.Image) *compute.Plan {

pkg/cloud/azure/services/virtualmachines/virtualmachines_test.go

@@ -842,7 +842,7 @@ func TestGetSpotVMOptions(t *testing.T) {
 				MaxPrice: &maxPrice,
 			},
 			priority:       compute.VirtualMachinePriorityTypesSpot,
-			evictionPolicy: compute.VirtualMachineEvictionPolicyTypesDeallocate,
+			evictionPolicy: compute.VirtualMachineEvictionPolicyTypesDelete,
 			billingProfile: &compute.BillingProfile{
 				MaxPrice: &maxPriceFloat,
 			},
@@ -858,7 +858,7 @@ func TestGetSpotVMOptions(t *testing.T) {
 			name:           "not return an error with empty spot vm options",
 			spotVMOptions:  &machinev1.SpotVMOptions{},
 			priority:       compute.VirtualMachinePriorityTypesSpot,
-			evictionPolicy: compute.VirtualMachineEvictionPolicyTypesDeallocate,
+			evictionPolicy: compute.VirtualMachineEvictionPolicyTypesDelete,
 			billingProfile: &compute.BillingProfile{
 				MaxPrice: nil,
 			},
@@ -869,7 +869,7 @@ func TestGetSpotVMOptions(t *testing.T) {
 				MaxPrice: nil,
 			},
 			priority:       compute.VirtualMachinePriorityTypesSpot,
-			evictionPolicy: compute.VirtualMachineEvictionPolicyTypesDeallocate,
+			evictionPolicy: compute.VirtualMachineEvictionPolicyTypesDelete,
 			billingProfile: &compute.BillingProfile{
 				MaxPrice: nil,
 			},