Skip to content

Commit 2079205

Browse files
Revert "added secondary location as per AVM module"
This reverts commit c17a982.
1 parent c17a982 commit 2079205

2 files changed

Lines changed: 4 additions & 16 deletions

File tree

infra/main.bicep

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ param solutionName string = 'kmgs'
99
@description('Optional. Azure location for the solution. If not provided, it defaults to the resource group location.')
1010
param location string = ''
1111

12-
@minLength(3)
13-
@description('Optional. Secondary location for databases creation.')
14-
param secondaryLocation string = 'uksouth'
15-
1612
@maxLength(5)
1713
@description('Optional. A unique token for the solution. This is used to ensure resource names are unique for global resources. Defaults to a 5-character substring of the unique string generated from the subscription ID, resource group name, and solution name.')
1814
param solutionUniqueToken string = substring(uniqueString(subscription().id, resourceGroup().name, solutionName), 0, 5)
@@ -142,7 +138,7 @@ var replicaRegionPairs = {
142138
uksouth: 'westeurope'
143139
westeurope: 'northeurope'
144140
}
145-
var replicaLocation = replicaRegionPairs[?solutionLocation] ?? secondaryLocation
141+
var replicaLocation = replicaRegionPairs[solutionLocation]
146142

147143
// Region pairs list based on article in [Azure Database for MySQL Flexible Server - Azure Regions](https://learn.microsoft.com/azure/mysql/flexible-server/overview#azure-regions) for supported high availability regions for CosmosDB.
148144
var cosmosDbZoneRedundantHaRegionPairs = {

infra/main.json

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.40.2.10011",
9-
"templateHash": "454231766837079804"
9+
"templateHash": "8417814553440700358"
1010
}
1111
},
1212
"parameters": {
@@ -26,14 +26,6 @@
2626
"description": "Optional. Azure location for the solution. If not provided, it defaults to the resource group location."
2727
}
2828
},
29-
"secondaryLocation": {
30-
"type": "string",
31-
"defaultValue": "uksouth",
32-
"minLength": 3,
33-
"metadata": {
34-
"description": "Optional. Secondary location for databases creation."
35-
}
36-
},
3729
"solutionUniqueToken": {
3830
"type": "string",
3931
"defaultValue": "[substring(uniqueString(subscription().id, resourceGroup().name, parameters('solutionName')), 0, 5)]",
@@ -215,7 +207,7 @@
215207
"uksouth": "westeurope",
216208
"westeurope": "northeurope"
217209
},
218-
"replicaLocation": "[coalesce(tryGet(variables('replicaRegionPairs'), variables('solutionLocation')), parameters('secondaryLocation'))]",
210+
"replicaLocation": "[variables('replicaRegionPairs')[variables('solutionLocation')]]",
219211
"cosmosDbZoneRedundantHaRegionPairs": {
220212
"australiaeast": "uksouth",
221213
"centralus": "eastus2",
@@ -44138,7 +44130,7 @@
4413844130
"value": "[parameters('enableTelemetry')]"
4413944131
},
4414044132
"kubernetesVersion": {
44141-
"value": "1.34.2"
44133+
"value": "1.32.7"
4414244134
},
4414344135
"dnsPrefix": {
4414444136
"value": "[format('aks-{0}', variables('solutionSuffix'))]"

0 commit comments

Comments
 (0)