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.

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

Update storage version #231

Merged
merged 1 commit into from
Oct 3, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/main/bicep/mainTemplate.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ var name_publicIPAddress = '${name_dmgrVM}-ip'
var name_share = 'wasshare'
var name_storageAccount = 'storage${guidValue}'
var name_storageAccountPrivateEndpoint = 'storagepe${guidValue}'
var ref_storageAccountPrivateEndpoint = const_configureIHS ? reference(name_storageAccountPrivateEndpoint, '2023-01-01').customDnsConfigs[0].ipAddresses[0] : ''
var ref_storageAccountPrivateEndpoint = const_configureIHS ? reference(name_storageAccountPrivateEndpoint, '2023-06-01').customDnsConfigs[0].ipAddresses[0] : ''

var obj_uamiForDeploymentScript = {
type: 'UserAssigned'
Expand Down Expand Up @@ -257,7 +257,7 @@ module uamiDeployment 'modules/_uami/_uamiAndRoles.bicep' = if (const_configureA
}
}

resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = {
resource storageAccount 'Microsoft.Storage/storageAccounts@2023-06-01' = {
name: name_storageAccount
location: location
sku: {
Expand Down Expand Up @@ -292,12 +292,12 @@ resource storageAccountPrivateEndpoint 'Microsoft.Network/privateEndpoints@2023-
]
}

resource storageAccountFileSvc 'Microsoft.Storage/storageAccounts/fileServices@2023-01-01' = if (const_configureIHS) {
resource storageAccountFileSvc 'Microsoft.Storage/storageAccounts/fileServices@2023-06-01' = if (const_configureIHS) {
parent: storageAccount
name: 'default'
}

resource storageAccountFileShare 'Microsoft.Storage/storageAccounts/fileServices/shares@2023-01-01' = if (const_configureIHS) {
resource storageAccountFileShare 'Microsoft.Storage/storageAccounts/fileServices/shares@2023-06-01' = if (const_configureIHS) {
parent: storageAccountFileSvc
name: name_share
properties: {
Expand Down Expand Up @@ -612,7 +612,7 @@ resource clusterVMs 'Microsoft.Compute/virtualMachines@2023-07-01' = [for i in r
diagnosticsProfile: {
bootDiagnostics: {
enabled: true
storageUri: reference(storageAccount.id, '2023-01-01').primaryEndpoints.blob
storageUri: reference(storageAccount.id, '2023-06-01').primaryEndpoints.blob
}
}
}
Expand Down Expand Up @@ -669,7 +669,7 @@ resource clusterVMsExtension 'Microsoft.Compute/virtualMachines/extensions@2023-
]
}
protectedSettings: {
commandToExecute: format('sh install.sh {0}{1}{2}', i == 0, const_arguments, const_configureIHS ? format(' {0} {1}{2} {3}', name_storageAccount, listKeys(storageAccount.id, '2023-01-01').keys[0].value, const_ihsArguments2, ref_storageAccountPrivateEndpoint) : '')
commandToExecute: format('sh install.sh {0}{1}{2}', i == 0, const_arguments, const_configureIHS ? format(' {0} {1}{2} {3}', name_storageAccount, listKeys(storageAccount.id, '2023-06-01').keys[0].value, const_ihsArguments2, ref_storageAccountPrivateEndpoint) : '')
}
}
dependsOn: [
Expand Down Expand Up @@ -796,7 +796,7 @@ resource ihsVM 'Microsoft.Compute/virtualMachines@2023-07-01' = if (const_config
diagnosticsProfile: {
bootDiagnostics: {
enabled: true
storageUri: reference(storageAccount.id, '2023-01-01').primaryEndpoints.blob
storageUri: reference(storageAccount.id, '2023-06-01').primaryEndpoints.blob
}
}
}
Expand Down Expand Up @@ -831,7 +831,7 @@ resource ihsVMExtension 'Microsoft.Compute/virtualMachines/extensions@2023-07-01
]
}
protectedSettings: {
commandToExecute: format('sh configure-ihs.sh{0} {1}{2} {3}', const_ihsArguments1, listKeys(storageAccount.id, '2023-01-01').keys[0].value, const_ihsArguments2, ref_storageAccountPrivateEndpoint)
commandToExecute: format('sh configure-ihs.sh{0} {1}{2} {3}', const_ihsArguments1, listKeys(storageAccount.id, '2023-06-01').keys[0].value, const_ihsArguments2, ref_storageAccountPrivateEndpoint)
}
}
dependsOn: [
Expand Down