Skip to content

K
k3s
Unverified Commit 83f6efce authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #66736 from hanxiaoshuai/cleanup0728

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. use func WaitForCompletionRef replace of deprecated func WaitForCompletion **What this PR does / why we need it**: use func WaitForCompletionRef replace of deprecated func WaitForCompletion ``` // WaitForCompletion will return when one of the following conditions is met: the long // running operation has completed, the provided context is cancelled, or the client's // polling duration has been exceeded. It will retry failed polling attempts based on // the retry value defined in the client up to the maximum retry attempts. // Deprecated: Please use WaitForCompletionRef() instead. func (f Future) WaitForCompletion(ctx context.Context, client autorest.Client) error { return f.WaitForCompletionRef(ctx, client) } ``` **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 4602f0e1 5fe4a1f2
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
pkg/cloudprovider/providers/azure/azure_client.go
View file @ 83f6efce
...@@ -185,7 +185,7 @@ func (az *azVirtualMachinesClient) CreateOrUpdate(ctx context.Context, resourceG ...@@ -185,7 +185,7 @@ func (az *azVirtualMachinesClient) CreateOrUpdate(ctx context.Context, resourceG
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -277,7 +277,7 @@ func (az *azInterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroupN ...@@ -277,7 +277,7 @@ func (az *azInterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroupN
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -356,7 +356,7 @@ func (az *azLoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGro ...@@ -356,7 +356,7 @@ func (az *azLoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGro
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -380,7 +380,7 @@ func (az *azLoadBalancersClient) Delete(ctx context.Context, resourceGroupName s ...@@ -380,7 +380,7 @@ func (az *azLoadBalancersClient) Delete(ctx context.Context, resourceGroupName s
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -472,7 +472,7 @@ func (az *azPublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resourc ...@@ -472,7 +472,7 @@ func (az *azPublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resourc
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -496,7 +496,7 @@ func (az *azPublicIPAddressesClient) Delete(ctx context.Context, resourceGroupNa ...@@ -496,7 +496,7 @@ func (az *azPublicIPAddressesClient) Delete(ctx context.Context, resourceGroupNa
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -587,7 +587,7 @@ func (az *azSubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName ...@@ -587,7 +587,7 @@ func (az *azSubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -611,7 +611,7 @@ func (az *azSubnetsClient) Delete(ctx context.Context, resourceGroupName string, ...@@ -611,7 +611,7 @@ func (az *azSubnetsClient) Delete(ctx context.Context, resourceGroupName string,
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -702,7 +702,7 @@ func (az *azSecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGr ...@@ -702,7 +702,7 @@ func (az *azSecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGr
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -726,7 +726,7 @@ func (az *azSecurityGroupsClient) Delete(ctx context.Context, resourceGroupName ...@@ -726,7 +726,7 @@ func (az *azSecurityGroupsClient) Delete(ctx context.Context, resourceGroupName
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -817,7 +817,7 @@ func (az *azVirtualMachineScaleSetsClient) CreateOrUpdate(ctx context.Context, r ...@@ -817,7 +817,7 @@ func (az *azVirtualMachineScaleSetsClient) CreateOrUpdate(ctx context.Context, r
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -888,7 +888,7 @@ func (az *azVirtualMachineScaleSetsClient) UpdateInstances(ctx context.Context, ...@@ -888,7 +888,7 @@ func (az *azVirtualMachineScaleSetsClient) UpdateInstances(ctx context.Context,
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -996,7 +996,7 @@ func (az *azVirtualMachineScaleSetVMsClient) Update(ctx context.Context, resourc ...@@ -996,7 +996,7 @@ func (az *azVirtualMachineScaleSetVMsClient) Update(ctx context.Context, resourc
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -1041,7 +1041,7 @@ func (az *azRoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName ...@@ -1041,7 +1041,7 @@ func (az *azRoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -1065,7 +1065,7 @@ func (az *azRoutesClient) Delete(ctx context.Context, resourceGroupName string, ...@@ -1065,7 +1065,7 @@ func (az *azRoutesClient) Delete(ctx context.Context, resourceGroupName string,
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -1110,7 +1110,7 @@ func (az *azRouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGroup ...@@ -1110,7 +1110,7 @@ func (az *azRouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGroup
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -1170,7 +1170,7 @@ func (az *azStorageAccountClient) Create(ctx context.Context, resourceGroupName ...@@ -1170,7 +1170,7 @@ func (az *azStorageAccountClient) Create(ctx context.Context, resourceGroupName
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -1282,7 +1282,7 @@ func (az *azDisksClient) CreateOrUpdate(ctx context.Context, resourceGroupName s ...@@ -1282,7 +1282,7 @@ func (az *azDisksClient) CreateOrUpdate(ctx context.Context, resourceGroupName s
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
...@@ -1306,7 +1306,7 @@ func (az *azDisksClient) Delete(ctx context.Context, resourceGroupName string, d ...@@ -1306,7 +1306,7 @@ func (az *azDisksClient) Delete(ctx context.Context, resourceGroupName string, d
return future.Response(), err return future.Response(), err
} }
err = future.WaitForCompletion(ctx, az.client.Client) err = future.WaitForCompletionRef(ctx, az.client.Client)
mc.Observe(err) mc.Observe(err)
return future.Response(), err return future.Response(), err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment