github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup the workarounds for augmented NSGs since it has been GA

Browse Source
This commit is contained in:
Pengfei Ni 2019-05-05 14:53:00 +08:00
parent df29573ec5
commit f085c991cc
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go
View File

@ -1177,14 +1177,6 @@ func (az *Cloud) reconcileSecurityGroup(clusterName string, service *v1.Service,
err := az.CreateOrUpdateSecurityGroup(service, sg) err := az.CreateOrUpdateSecurityGroup(service, sg)
if err != nil { if err != nil {
klog.V(2).Infof("ensure(%s) abort backoff: sg(%s) - updating", serviceName, *sg.Name) klog.V(2).Infof("ensure(%s) abort backoff: sg(%s) - updating", serviceName, *sg.Name)
// TODO (Nov 2017): remove when augmented security rules are out of preview
// we could try to parse the response but it's not worth it for bridging a preview
errorDescription := err.Error()
if strings.Contains(errorDescription, "SubscriptionNotRegisteredForFeature") && strings.Contains(errorDescription, "Microsoft.Network/AllowAccessRuleExtendedProperties") {
sharedRuleError := fmt.Errorf("Shared security rules are not available in this Azure region. Details: %v", errorDescription)
return nil, sharedRuleError
}
// END TODO
return nil, err return nil, err
} }
klog.V(10).Infof("CreateOrUpdateSecurityGroup(%q): end", *sg.Name) klog.V(10).Infof("CreateOrUpdateSecurityGroup(%q): end", *sg.Name)