Skip to content

Commit 86546c6

Browse files
authored
update default templates (#26208)
* update default templates * update names and pass * update template values * update parameter name * add Platinum value
1 parent a632ad0 commit 86546c6

File tree

2 files changed

+36
-14
lines changed

2 files changed

+36
-14
lines changed

src/ServiceFabric/ServiceFabric/Template/Windows/parameter.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"value": "WindowsServer"
2222
},
2323
"vmImageSku": {
24-
"value": "2016-Datacenter-with-Containers"
24+
"value": "2022-datacenter-azure-edition"
2525
},
2626
"vmImageVersion": {
2727
"value": "latest"
@@ -60,10 +60,10 @@
6060
"value": 5
6161
},
6262
"vmNodeType0Size": {
63-
"value": "Standard_D2_V2"
63+
"value": "Standard_D2s_v3"
6464
},
6565
"durabilityLevel": {
66-
"value": "Bronze"
66+
"value": "Silver"
6767
},
6868
"reliabilityLevel": {
6969
"value": "Silver"

src/ServiceFabric/ServiceFabric/Template/Windows/template.json

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
"vmImageSku": {
4545
"type": "string",
46-
"defaultValue": "2016-Datacenter-with-Containers",
46+
"defaultValue": "2022-datacenter-azure-edition",
4747
"metadata": {
4848
"description": "VM image SKU"
4949
}
@@ -151,14 +151,23 @@
151151
},
152152
"vmNodeType0Size": {
153153
"type": "string",
154-
"defaultValue": "Standard_D2_V2"
154+
"defaultValue": "Standard_D2s_v3"
155155
},
156156
"durabilityLevel": {
157157
"type": "string",
158-
"defaultValue": "Bronze"
158+
"allowedValues": [
159+
"Silver",
160+
"Gold"
161+
],
162+
"defaultValue": "Silver"
159163
},
160164
"reliabilityLevel": {
161165
"type": "string",
166+
"allowedValues": [
167+
"Silver",
168+
"Gold",
169+
"Platinum"
170+
],
162171
"defaultValue": "Silver"
163172
}
164173
},
@@ -179,12 +188,12 @@
179188
"maxPercentUpgradeDomainDeltaUnhealthyNodes": "100",
180189
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
181190
"overProvision": "false",
182-
"vmssApiVersion": "2017-03-30",
183-
"sfrpApiVersion": "2019-03-01",
184-
"lbApiVersion": "2015-06-15",
185-
"vNetApiVersion": "2015-06-15",
186-
"storageApiVersion": "2016-01-01",
187-
"publicIPApiVersion": "2015-06-15",
191+
"vmssApiVersion": "2023-09-01",
192+
"sfrpApiVersion": "2023-11-01-preview",
193+
"lbApiVersion": "2023-09-01",
194+
"vNetApiVersion": "2023-09-01",
195+
"storageApiVersion": "2023-01-01",
196+
"publicIPApiVersion": "2023-09-01",
188197
"nt0applicationStartPort": "20000",
189198
"nt0applicationEndPort": "30000",
190199
"nt0ephemeralStartPort": "49152",
@@ -614,11 +623,24 @@
614623
"properties": {
615624
"overprovision": "[variables('overProvision')]",
616625
"upgradePolicy": {
617-
"mode": "Automatic"
626+
"mode": "Automatic",
627+
"automaticOSUpgradePolicy": {
628+
"enableAutomaticOSUpgrade": true
629+
}
618630
},
619631
"virtualMachineProfile": {
620632
"extensionProfile": {
621633
"extensions": [
634+
{
635+
"name": "Microsoft.Azure.Geneva.GenevaMonitoring",
636+
"properties": {
637+
"publisher": "Microsoft.Azure.Geneva",
638+
"type": "GenevaMonitoring",
639+
"typeHandlerVersion": "2.0",
640+
"enableAutomaticUpgrade": true,
641+
"autoUpgradeMinorVersion": true
642+
}
643+
},
622644
{
623645
"name": "[concat('ServiceFabricNodeVmExt','_vmNodeType0Name')]",
624646
"properties": {
@@ -641,7 +663,7 @@
641663
"x509StoreName": "[parameters('certificateStoreValue')]"
642664
}
643665
},
644-
"typeHandlerVersion": "1.0"
666+
"typeHandlerVersion": "1.1"
645667
}
646668
},
647669
{

0 commit comments

Comments
 (0)