Merge pull request #88463 from feiskyer/cleanup-backoff

Remove the unsupported CloudProviderBackoffMode from Azure cloud provider config

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

@@ -79,9 +79,6 @@ const (
 	vmTypeVMSS     = "vmss"
 	vmTypeStandard = "standard"
 
-	backoffModeDefault = "default"
-	backoffModeV2      = "v2"
-
 	loadBalancerSkuBasic    = "basic"
 	loadBalancerSkuStandard = "standard"
 
@@ -161,12 +158,6 @@ type Config struct {
 	CloudProviderBackoffDuration int `json:"cloudProviderBackoffDuration,omitempty" yaml:"cloudProviderBackoffDuration,omitempty"`
 	// Backoff jitter
 	CloudProviderBackoffJitter float64 `json:"cloudProviderBackoffJitter,omitempty" yaml:"cloudProviderBackoffJitter,omitempty"`
-	// Backoff mode, options are v2 and default.
-	// * default means two-layer backoff retrying, one in the cloud provider and the other in the Azure SDK.
-	// * v2 means only backoff in the Azure SDK is used. In such mode, CloudProviderBackoffDuration and
-	//   CloudProviderBackoffJitter are omitted.
-	// "default" will be used if not specified.
-	CloudProviderBackoffMode string `json:"cloudProviderBackoffMode,omitempty" yaml:"cloudProviderBackoffMode,omitempty"`
 	// Use instance metadata service where possible
 	UseInstanceMetadata bool `json:"useInstanceMetadata,omitempty" yaml:"useInstanceMetadata,omitempty"`
 
@@ -419,22 +410,17 @@ func (az *Cloud) InitializeCloudFromConfig(config *Config, fromSecret bool) erro
 		}
 		if config.CloudProviderBackoffExponent == 0 {
 			config.CloudProviderBackoffExponent = backoffExponentDefault
-		} else if config.shouldOmitCloudProviderBackoff() {
-			klog.Warning("Azure cloud provider config 'cloudProviderBackoffExponent' has been deprecated for 'v2' backoff mode. 2 is always used as the backoff exponent.")
-		}
-		if config.CloudProviderBackoffJitter == 0 {
-			config.CloudProviderBackoffJitter = backoffJitterDefault
-		} else if config.shouldOmitCloudProviderBackoff() {
-			klog.Warning("Azure cloud provider config 'cloudProviderBackoffJitter' has been deprecated for 'v2' backoff mode.")
 		}
 
-		if !config.shouldOmitCloudProviderBackoff() {
+		if config.CloudProviderBackoffJitter == 0 {
-			resourceRequestBackoff = wait.Backoff{
+			config.CloudProviderBackoffJitter = backoffJitterDefault
-				Steps:    config.CloudProviderBackoffRetries,
+		}
-				Factor:   config.CloudProviderBackoffExponent,
+
-				Duration: time.Duration(config.CloudProviderBackoffDuration) * time.Second,
+		resourceRequestBackoff = wait.Backoff{
-				Jitter:   config.CloudProviderBackoffJitter,
+			Steps:    config.CloudProviderBackoffRetries,
-			}
+			Factor:   config.CloudProviderBackoffExponent,
+			Duration: time.Duration(config.CloudProviderBackoffDuration) * time.Second,
+			Jitter:   config.CloudProviderBackoffJitter,
 		}
 		klog.V(2).Infof("Azure cloudprovider using try backoff: retries=%d, exponent=%f, duration=%d, jitter=%f",
 			config.CloudProviderBackoffRetries,
@@ -602,14 +588,11 @@ func (az *Cloud) configAzureClients(
 
 func (az *Cloud) getAzureClientConfig(servicePrincipalToken *adal.ServicePrincipalToken) *azclients.ClientConfig {
 	azClientConfig := &azclients.ClientConfig{
-		Location:                       az.Config.Location,
+		Location:                az.Config.Location,
-		SubscriptionID:                 az.Config.SubscriptionID,
+		SubscriptionID:          az.Config.SubscriptionID,
-		ResourceManagerEndpoint:        az.Environment.ResourceManagerEndpoint,
+		ResourceManagerEndpoint: az.Environment.ResourceManagerEndpoint,
-		CloudProviderBackoffRetries:    az.Config.CloudProviderBackoffRetries,
+		Authorizer:              autorest.NewBearerAuthorizer(servicePrincipalToken),
-		CloudProviderBackoffDuration:   az.Config.CloudProviderBackoffDuration,
+		Backoff:                 &retry.Backoff{Steps: 1},
-		ShouldOmitCloudProviderBackoff: az.Config.shouldOmitCloudProviderBackoff(),
-		Authorizer:                     autorest.NewBearerAuthorizer(servicePrincipalToken),
-		Backoff:                        &retry.Backoff{Steps: 1},
 	}
 
 	if az.Config.CloudProviderBackoff {

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

@@ -104,10 +104,6 @@ func (az *Cloud) ListVirtualMachines(resourceGroup string) ([]compute.VirtualMac
 // getPrivateIPsForMachine is wrapper for optional backoff getting private ips
 // list of a node by name
 func (az *Cloud) getPrivateIPsForMachine(nodeName types.NodeName) ([]string, error) {
-	if az.Config.shouldOmitCloudProviderBackoff() {
-		return az.vmSet.GetPrivateIPsByNodeName(string(nodeName))
-	}
-
 	return az.getPrivateIPsForMachineWithRetry(nodeName)
 }
 
@@ -131,10 +127,6 @@ func (az *Cloud) getPrivateIPsForMachineWithRetry(nodeName types.NodeName) ([]st
 }
 
 func (az *Cloud) getIPForMachine(nodeName types.NodeName) (string, string, error) {
-	if az.Config.shouldOmitCloudProviderBackoff() {
-		return az.vmSet.GetIPByNodeName(string(nodeName))
-	}
-
 	return az.GetIPForMachineWithRetry(nodeName)
 }
 
@@ -399,7 +391,3 @@ func (az *Cloud) CreateOrUpdateVMSS(resourceGroupName string, VMScaleSetName str
 
 	return nil
 }
-
-func (cfg *Config) shouldOmitCloudProviderBackoff() bool {
-	return cfg.CloudProviderBackoffMode == backoffModeV2
-}

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

@@ -32,12 +32,6 @@ type ClientConfig struct {
 	Authorizer              autorest.Authorizer
 	RateLimitConfig         *RateLimitConfig
 	Backoff                 *retry.Backoff
-
-	// Depracated configures (retry.Backoff is preferred).
-	// Those configurations would be removed after all Azure clients are moved to new implementations.
-	CloudProviderBackoffRetries    int
-	CloudProviderBackoffDuration   int
-	ShouldOmitCloudProviderBackoff bool
 }
 
 // WithRateLimiter returns a new ClientConfig with rateLimitConfig set.