Merge pull request #3190 from marwanad/fix-bad-cherry-pick-3141-1.18

1.18: fix bad cherry-pick for #3141
kubernetes · Jun 4, 2020 · f7aa0e9 · f7aa0e9
2 parents c6d8539 + 8f880ac
commit f7aa0e9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cluster-autoscaler/cloudprovider/azure/azure_scale_set.go b/cluster-autoscaler/cloudprovider/azure/azure_scale_set.go
@@ -321,7 +321,7 @@ func (scaleSet *ScaleSet) IncreaseSize(delta int) error {
 }
 
 // GetScaleSetVms returns list of nodes for the given scale set.
-func (scaleSet *ScaleSet) GetScaleSetVms() ([]compute.VirtualMachineScaleSetVM, error) {
+func (scaleSet *ScaleSet) GetScaleSetVms() ([]compute.VirtualMachineScaleSetVM, *retry.Error) {
 	klog.V(4).Infof("GetScaleSetVms: starts")
 	ctx, cancel := getContextWithCancel()
 	defer cancel()