Skip to content

Commit 97d838e

Browse files
mwesigwagumamwesigwaguma
authored
update templates (#26109)
1 parent a9b7146 commit 97d838e

File tree

4 files changed

+54
-28
lines changed

4 files changed

+54
-28
lines changed

‎src/ServiceFabric/ServiceFabric.Test/Resources/parameters.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"value": "WindowsServer"
2222
},
2323
"vmImageSku": {
24-
"value": "2022-Datacenter"
24+
"value": "2022-datacenter-azure-edition"
2525
},
2626
"vmImageVersion": {
2727
"value": "latest"
@@ -60,7 +60,7 @@
6060
"value": 5
6161
},
6262
"vmNodeType0Size": {
63-
"value": "Standard_D2_V2"
63+
"value": "Standard_D2s_v3"
6464
}
6565
}
6666
}

‎src/ServiceFabric/ServiceFabric.Test/Resources/parametersCNCert.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"value": "WindowsServer"
2222
},
2323
"vmImageSku": {
24-
"value": "2022-Datacenter"
24+
"value": "2022-datacenter-azure-edition"
2525
},
2626
"vmImageVersion": {
2727
"value": "latest"
@@ -63,7 +63,7 @@
6363
"value": 5
6464
},
6565
"vmNodeType0Size": {
66-
"value": "Standard_D2_V2"
66+
"value": "Standard_D2s_v3"
6767
}
6868
}
6969
}

‎src/ServiceFabric/ServiceFabric.Test/Resources/template.json

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
"vmImageSku": {
4545
"type": "string",
46-
"defaultValue": "2022-Datacenter",
46+
"defaultValue": "2022-datacenter-azure-edition",
4747
"metadata": {
4848
"description": "VM image SKU"
4949
}
@@ -151,7 +151,7 @@
151151
},
152152
"vmNodeType0Size": {
153153
"type": "string",
154-
"defaultValue": "Standard_D2_V2"
154+
"defaultValue": "Standard_D2s_v3"
155155
}
156156
},
157157
"variables": {
@@ -171,12 +171,12 @@
171171
"maxPercentUpgradeDomainDeltaUnhealthyNodes": "100",
172172
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
173173
"overProvision": "false",
174-
"vmssApiVersion": "2017-03-30",
175-
"sfrpApiVersion": "2017-07-01-preview",
176-
"lbApiVersion": "2015-06-15",
177-
"vNetApiVersion": "2015-06-15",
178-
"storageApiVersion": "2016-01-01",
179-
"publicIPApiVersion": "2015-06-15",
174+
"vmssApiVersion": "2023-09-01",
175+
"sfrpApiVersion": "2023-11-01-preview",
176+
"lbApiVersion": "2023-09-01",
177+
"vNetApiVersion": "2023-09-01",
178+
"storageApiVersion": "2023-01-01",
179+
"publicIPApiVersion": "2023-09-01",
180180
"nt0applicationStartPort": "20000",
181181
"nt0applicationEndPort": "30000",
182182
"nt0ephemeralStartPort": "49152",
@@ -606,11 +606,24 @@
606606
"properties": {
607607
"overprovision": "[variables('overProvision')]",
608608
"upgradePolicy": {
609-
"mode": "Automatic"
609+
"mode": "Automatic",
610+
"automaticOSUpgradePolicy": {
611+
"enableAutomaticOSUpgrade": true
612+
}
610613
},
611614
"virtualMachineProfile": {
612615
"extensionProfile": {
613616
"extensions": [
617+
{
618+
"name": "Microsoft.Azure.Geneva.GenevaMonitoring",
619+
"properties": {
620+
"publisher": "Microsoft.Azure.Geneva",
621+
"type": "GenevaMonitoring",
622+
"typeHandlerVersion": "2.0",
623+
"enableAutomaticUpgrade": true,
624+
"autoUpgradeMinorVersion": true
625+
}
626+
},
614627
{
615628
"name": "[concat('ServiceFabricNodeVmExt','_vmNodeType0Name')]",
616629
"properties": {
@@ -625,15 +638,15 @@
625638
"clusterEndpoint": "[reference(parameters('clusterName')).clusterEndpoint]",
626639
"nodeTypeRef": "[variables('vmNodeType0Name')]",
627640
"dataPath": "D:\\SvcFab",
628-
"durabilityLevel": "Bronze",
641+
"durabilityLevel": "Silver",
629642
"enableParallelJobs": true,
630643
"nicPrefixOverride": "[variables('subnet0Prefix')]",
631644
"certificate": {
632645
"thumbprint": "[parameters('certificateThumbprint')]",
633646
"x509StoreName": "[parameters('certificateStoreValue')]"
634647
}
635648
},
636-
"typeHandlerVersion": "1.0"
649+
"typeHandlerVersion": "1.1"
637650
}
638651
},
639652
{
@@ -810,7 +823,7 @@
810823
"startPort": "[variables('nt0applicationStartPort')]"
811824
},
812825
"clientConnectionEndpointPort": "[variables('nt0fabricTcpGatewayPort')]",
813-
"durabilityLevel": "Bronze",
826+
"durabilityLevel": "Silver",
814827
"ephemeralPorts": {
815828
"endPort": "[variables('nt0ephemeralEndPort')]",
816829
"startPort": "[variables('nt0ephemeralStartPort')]"

‎src/ServiceFabric/ServiceFabric.Test/Resources/templateCNCert.json

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
"vmImageSku": {
4545
"type": "string",
46-
"defaultValue": "2022-Datacenter",
46+
"defaultValue": "2022-datacenter-azure-edition",
4747
"metadata": {
4848
"description": "VM image SKU"
4949
}
@@ -157,7 +157,7 @@
157157
},
158158
"vmNodeType0Size": {
159159
"type": "string",
160-
"defaultValue": "Standard_D2_V2"
160+
"defaultValue": "Standard_D2s_v3"
161161
}
162162
},
163163
"variables": {
@@ -177,12 +177,12 @@
177177
"maxPercentUpgradeDomainDeltaUnhealthyNodes": "100",
178178
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
179179
"overProvision": "false",
180-
"vmssApiVersion": "2017-03-30",
181-
"sfrpApiVersion": "2018-02-01",
182-
"lbApiVersion": "2015-06-15",
183-
"vNetApiVersion": "2015-06-15",
184-
"storageApiVersion": "2016-01-01",
185-
"publicIPApiVersion": "2015-06-15",
180+
"vmssApiVersion": "2023-09-01",
181+
"sfrpApiVersion": "2023-11-01-preview",
182+
"lbApiVersion": "2023-09-01",
183+
"vNetApiVersion": "2023-09-01",
184+
"storageApiVersion": "2023-01-01",
185+
"publicIPApiVersion": "2023-09-01",
186186
"nt0applicationStartPort": "20000",
187187
"nt0applicationEndPort": "30000",
188188
"nt0ephemeralStartPort": "49152",
@@ -612,11 +612,24 @@
612612
"properties": {
613613
"overprovision": "[variables('overProvision')]",
614614
"upgradePolicy": {
615-
"mode": "Automatic"
615+
"mode": "Automatic",
616+
"automaticOSUpgradePolicy": {
617+
"enableAutomaticOSUpgrade": true
618+
}
616619
},
617620
"virtualMachineProfile": {
618621
"extensionProfile": {
619622
"extensions": [
623+
{
624+
"name": "Microsoft.Azure.Geneva.GenevaMonitoring",
625+
"properties": {
626+
"publisher": "Microsoft.Azure.Geneva",
627+
"type": "GenevaMonitoring",
628+
"typeHandlerVersion": "2.0",
629+
"enableAutomaticUpgrade": true,
630+
"autoUpgradeMinorVersion": true
631+
}
632+
},
620633
{
621634
"name": "[concat('ServiceFabricNodeVmExt','_vmNodeType0Name')]",
622635
"properties": {
@@ -631,7 +644,7 @@
631644
"clusterEndpoint": "[reference(parameters('clusterName')).clusterEndpoint]",
632645
"nodeTypeRef": "[variables('vmNodeType0Name')]",
633646
"dataPath": "D:\\SvcFab",
634-
"durabilityLevel": "Bronze",
647+
"durabilityLevel": "Silver",
635648
"enableParallelJobs": true,
636649
"nicPrefixOverride": "[variables('subnet0Prefix')]",
637650
"certificate": {
@@ -641,7 +654,7 @@
641654
"x509StoreName": "[parameters('certificateStoreValue')]"
642655
}
643656
},
644-
"typeHandlerVersion": "1.0"
657+
"typeHandlerVersion": "1.1"
645658
}
646659
},
647660
{
@@ -823,7 +836,7 @@
823836
"startPort": "[variables('nt0applicationStartPort')]"
824837
},
825838
"clientConnectionEndpointPort": "[variables('nt0fabricTcpGatewayPort')]",
826-
"durabilityLevel": "Bronze",
839+
"durabilityLevel": "Silver",
827840
"ephemeralPorts": {
828841
"endPort": "[variables('nt0ephemeralEndPort')]",
829842
"startPort": "[variables('nt0ephemeralStartPort')]"

0 commit comments

Comments
 (0)