Skip to content

Commit acd97b4

Browse files
authored
Merge pull request kubernetes#87959 from andyzhangx/non-retriable
add StatusConflict(409) as non-retriable error for disksClient
2 parents ca1514d + 0e47c86 commit acd97b4

File tree

1 file changed

+1
-1
lines changed
  • staging/src/k8s.io/legacy-cloud-providers/azure

1 file changed

+1
-1
lines changed

staging/src/k8s.io/legacy-cloud-providers/azure/azure.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ func (az *Cloud) InitializeCloudFromConfig(config *Config, fromSecret bool) erro
518518
az.VirtualMachineScaleSetVMsClient = vmssvmclient.New(vmssVMClientConfig)
519519

520520
disksClientConfig := azClientConfig.WithRateLimiter(config.DiskRateLimit)
521-
disksClientConfig.Backoff = disksClientConfig.Backoff.WithNonRetriableErrors([]string{}, []int{http.StatusNotFound})
521+
disksClientConfig.Backoff = disksClientConfig.Backoff.WithNonRetriableErrors([]string{}, []int{http.StatusNotFound, http.StatusConflict})
522522
az.DisksClient = diskclient.New(disksClientConfig)
523523

524524
if az.MaximumLoadBalancerRuleCount == 0 {

0 commit comments

Comments
 (0)