Skip to content

Commit 4ed620c

Browse files
authored
Merge pull request kubernetes#77459 from feiskyer/cleanup-nsg
Cleanup the workarounds for augmented NSGs since it has been GA
2 parents df29573 + f085c99 commit 4ed620c

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,14 +1177,6 @@ func (az *Cloud) reconcileSecurityGroup(clusterName string, service *v1.Service,
11771177
err := az.CreateOrUpdateSecurityGroup(service, sg)
11781178
if err != nil {
11791179
klog.V(2).Infof("ensure(%s) abort backoff: sg(%s) - updating", serviceName, *sg.Name)
1180-
// TODO (Nov 2017): remove when augmented security rules are out of preview
1181-
// we could try to parse the response but it's not worth it for bridging a preview
1182-
errorDescription := err.Error()
1183-
if strings.Contains(errorDescription, "SubscriptionNotRegisteredForFeature") && strings.Contains(errorDescription, "Microsoft.Network/AllowAccessRuleExtendedProperties") {
1184-
sharedRuleError := fmt.Errorf("Shared security rules are not available in this Azure region. Details: %v", errorDescription)
1185-
return nil, sharedRuleError
1186-
}
1187-
// END TODO
11881180
return nil, err
11891181
}
11901182
klog.V(10).Infof("CreateOrUpdateSecurityGroup(%q): end", *sg.Name)

0 commit comments

Comments
 (0)