Merge pull request kubernetes#3192 from marwanad/fix-build

k8s-ci-robot · web-flow · commit e057aa260373 · 2020-06-03T17:08:43.000-07:00
return correct error type for GetScaleSetVms
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()

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ func (scaleSet *ScaleSet) IncreaseSize(delta int) error {`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`// GetScaleSetVms returns list of nodes for the given scale set.`
`324`		`-func (scaleSet *ScaleSet) GetScaleSetVms() ([]compute.VirtualMachineScaleSetVM, error) {`
	`324`	`+func (scaleSet ScaleSet) GetScaleSetVms() ([]compute.VirtualMachineScaleSetVM, retry.Error) {`
`325`	`325`	`klog.V(4).Infof("GetScaleSetVms: starts")`
`326`	`326`	`ctx, cancel := getContextWithCancel()`
`327`	`327`	`defer cancel()`