Skip to content

Commit

Permalink
Merge pull request #98290 from nilo19/bug/cherry-pick-465-1.18
Browse files Browse the repository at this point in the history
Cherry pick #465 in cloud provider azure to 1.18: Cleanup subnet in frontend IP configs
  • Loading branch information
k8s-ci-robot committed Feb 4, 2021
2 parents d4b00b3 + feec99c commit 933bdbe
Showing 1 changed file with 29 additions and 0 deletions.
29 changes: 29 additions & 0 deletions staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go
Expand Up @@ -181,11 +181,40 @@ func (az *Cloud) CreateOrUpdateSecurityGroup(service *v1.Service, sg network.Sec
return rerr.Error()
}

func cleanupSubnetInFrontendIPConfigurations(lb *network.LoadBalancer) network.LoadBalancer {
if lb.LoadBalancerPropertiesFormat == nil || lb.FrontendIPConfigurations == nil {
return *lb
}

frontendIPConfigurations := *lb.FrontendIPConfigurations
for i := range frontendIPConfigurations {
config := frontendIPConfigurations[i]
if config.FrontendIPConfigurationPropertiesFormat != nil &&
config.Subnet != nil &&
config.Subnet.ID != nil {
subnet := network.Subnet{
ID: config.Subnet.ID,
}
if config.Subnet.Name != nil {
subnet.Name = config.FrontendIPConfigurationPropertiesFormat.Subnet.Name
}
config.FrontendIPConfigurationPropertiesFormat.Subnet = &subnet
frontendIPConfigurations[i] = config
continue
}
}

lb.FrontendIPConfigurations = &frontendIPConfigurations
return *lb
}

// CreateOrUpdateLB invokes az.LoadBalancerClient.CreateOrUpdate with exponential backoff retry
func (az *Cloud) CreateOrUpdateLB(service *v1.Service, lb network.LoadBalancer) error {
ctx, cancel := getContextWithCancel()
defer cancel()

lb = cleanupSubnetInFrontendIPConfigurations(&lb)

rgName := az.getLoadBalancerResourceGroup()
rerr := az.LoadBalancerClient.CreateOrUpdate(ctx, rgName, *lb.Name, lb, to.String(lb.Etag))
klog.V(10).Infof("LoadBalancerClient.CreateOrUpdate(%s): end", *lb.Name)
Expand Down

0 comments on commit 933bdbe

Please sign in to comment.