Skip to content

Commit ac738d3

Browse files
committed
f
1 parent b61303d commit ac738d3

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

controllers/azuremanagedmachinepool_reconciler.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"time"
2323

2424
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute"
25-
azureautorest "github.com/Azure/go-autorest/autorest/azure"
2625
"github.com/pkg/errors"
2726
azprovider "sigs.k8s.io/cloud-provider-azure/pkg/provider"
2827
"sigs.k8s.io/cluster-api-provider-azure/azure"
@@ -90,15 +89,11 @@ func newAzureManagedMachinePoolService(scope *scope.ManagedMachinePoolScope) (*a
9089
// scaleSetAuthorizer takes a scope and determines if a regional authorizer is needed for scale sets
9190
// see https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/1850 for context on region based authorizer.
9291
func scaleSetAuthorizer(scope *scope.ManagedMachinePoolScope) (azure.Authorizer, error) {
93-
if scope.Location() == "" {
94-
return scope, nil // no location so use default
92+
if scope.ControlPlane.Spec.AzureEnvironment == azure.PublicCloudName {
93+
return azure.WithRegionalBaseURI(scope, scope.Location()) // public cloud supports regional end points
9594
}
9695

97-
if scope.ControlPlane.Spec.AzureEnvironment == azureautorest.USGovernmentCloud.Name {
98-
return scope, nil // no region support in usgovcloud
99-
}
100-
101-
return azure.WithRegionalBaseURI(scope, scope.Location())
96+
return scope, nil
10297
}
10398

10499
// Reconcile reconciles all the services in a predetermined order.

0 commit comments

Comments
 (0)