Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: multi accounts creation issue when private endpoint creation failed #880

Merged
merged 1 commit into from
Oct 27, 2021
Merged

fix: multi accounts creation issue when private endpoint creation failed #880

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 12 additions & 9 deletions pkg/provider/azure_storageaccount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,18 @@ func (az *Cloud) EnsureStorageAccount(ctx context.Context, accountOptions *Accou
}
}

vnetResourceGroup := az.ResourceGroup
if len(az.VnetResourceGroup) > 0 {
vnetResourceGroup = az.VnetResourceGroup
}

if accountOptions.CreatePrivateEndpoint {
// Create DNS zone first, this could make sure driver has write permission on vnetResourceGroup
if err := az.createPrivateDNSZone(ctx, vnetResourceGroup); err != nil {
return "", "", fmt.Errorf("Failed to create private DNS zone(%s) in resourceGroup(%s), error: %v", PrivateDNSZoneName, vnetResourceGroup, err)
}
}

if createNewAccount {
// set network rules for storage account
var networkRuleSet *storage.NetworkRuleSet
Expand Down Expand Up @@ -250,10 +262,6 @@ func (az *Cloud) EnsureStorageAccount(ctx context.Context, accountOptions *Accou
}

if accountOptions.CreatePrivateEndpoint {
vnetResourceGroup := az.ResourceGroup
if len(az.VnetResourceGroup) > 0 {
vnetResourceGroup = az.VnetResourceGroup
}
// Get properties of the storageAccount
storageAccount, err := az.StorageAccountClient.GetProperties(ctx, resourceGroup, accountName)
if err != nil {
Expand All @@ -266,11 +274,6 @@ func (az *Cloud) EnsureStorageAccount(ctx context.Context, accountOptions *Accou
return "", "", fmt.Errorf("Failed to create private endpoint for storage account(%s), resourceGroup(%s), error: %v", accountName, vnetResourceGroup, err)
}

// Create DNS zone
if err := az.createPrivateDNSZone(ctx, vnetResourceGroup); err != nil {
return "", "", fmt.Errorf("Failed to create private DNS zone(%s) in resourceGroup(%s), error: %v", PrivateDNSZoneName, vnetResourceGroup, err)
}

// Create virtual link to the zone private DNS zone
vNetLinkName := accountName + "-vnetlink"
if err := az.createVNetLink(ctx, vNetLinkName, vnetResourceGroup); err != nil {
Expand Down