From 97e24430aa9068487ccc516eb36f9b4586d7b9d7 Mon Sep 17 00:00:00 2001 From: "Mwesigwa Guma (from Dev Box)" Date: Mon, 16 Sep 2024 11:20:12 -0400 Subject: [PATCH] update templates --- .../Resources/parameters.json | 4 +- .../Resources/parametersCNCert.json | 4 +- .../Resources/template.json | 37 +++++++++++++------ .../Resources/templateCNCert.json | 37 +++++++++++++------ 4 files changed, 54 insertions(+), 28 deletions(-) diff --git a/src/ServiceFabric/ServiceFabric.Test/Resources/parameters.json b/src/ServiceFabric/ServiceFabric.Test/Resources/parameters.json index 3309cef8c28d..a515e71f5271 100644 --- a/src/ServiceFabric/ServiceFabric.Test/Resources/parameters.json +++ b/src/ServiceFabric/ServiceFabric.Test/Resources/parameters.json @@ -21,7 +21,7 @@ "value": "WindowsServer" }, "vmImageSku": { - "value": "2022-Datacenter" + "value": "2022-datacenter-azure-edition" }, "vmImageVersion": { "value": "latest" @@ -60,7 +60,7 @@ "value": 5 }, "vmNodeType0Size": { - "value": "Standard_D2_V2" + "value": "Standard_D2s_v3" } } } \ No newline at end of file diff --git a/src/ServiceFabric/ServiceFabric.Test/Resources/parametersCNCert.json b/src/ServiceFabric/ServiceFabric.Test/Resources/parametersCNCert.json index b8252ecf6999..06c6d06dd403 100644 --- a/src/ServiceFabric/ServiceFabric.Test/Resources/parametersCNCert.json +++ b/src/ServiceFabric/ServiceFabric.Test/Resources/parametersCNCert.json @@ -21,7 +21,7 @@ "value": "WindowsServer" }, "vmImageSku": { - "value": "2022-Datacenter" + "value": "2022-datacenter-azure-edition" }, "vmImageVersion": { "value": "latest" @@ -63,7 +63,7 @@ "value": 5 }, "vmNodeType0Size": { - "value": "Standard_D2_V2" + "value": "Standard_D2s_v3" } } } \ No newline at end of file diff --git a/src/ServiceFabric/ServiceFabric.Test/Resources/template.json b/src/ServiceFabric/ServiceFabric.Test/Resources/template.json index 9d270dacef46..68579ab1ce04 100644 --- a/src/ServiceFabric/ServiceFabric.Test/Resources/template.json +++ b/src/ServiceFabric/ServiceFabric.Test/Resources/template.json @@ -43,7 +43,7 @@ }, "vmImageSku": { "type": "string", - "defaultValue": "2022-Datacenter", + "defaultValue": "2022-datacenter-azure-edition", "metadata": { "description": "VM image SKU" } @@ -151,7 +151,7 @@ }, "vmNodeType0Size": { "type": "string", - "defaultValue": "Standard_D2_V2" + "defaultValue": "Standard_D2s_v3" } }, "variables": { @@ -171,12 +171,12 @@ "maxPercentUpgradeDomainDeltaUnhealthyNodes": "100", "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]", "overProvision": "false", - "vmssApiVersion": "2017-03-30", - "sfrpApiVersion": "2017-07-01-preview", - "lbApiVersion": "2015-06-15", - "vNetApiVersion": "2015-06-15", - "storageApiVersion": "2016-01-01", - "publicIPApiVersion": "2015-06-15", + "vmssApiVersion": "2023-09-01", + "sfrpApiVersion": "2023-11-01-preview", + "lbApiVersion": "2023-09-01", + "vNetApiVersion": "2023-09-01", + "storageApiVersion": "2023-01-01", + "publicIPApiVersion": "2023-09-01", "nt0applicationStartPort": "20000", "nt0applicationEndPort": "30000", "nt0ephemeralStartPort": "49152", @@ -606,11 +606,24 @@ "properties": { "overprovision": "[variables('overProvision')]", "upgradePolicy": { - "mode": "Automatic" + "mode": "Automatic", + "automaticOSUpgradePolicy": { + "enableAutomaticOSUpgrade": true + } }, "virtualMachineProfile": { "extensionProfile": { "extensions": [ + { + "name": "Microsoft.Azure.Geneva.GenevaMonitoring", + "properties": { + "publisher": "Microsoft.Azure.Geneva", + "type": "GenevaMonitoring", + "typeHandlerVersion": "2.0", + "enableAutomaticUpgrade": true, + "autoUpgradeMinorVersion": true + } + }, { "name": "[concat('ServiceFabricNodeVmExt','_vmNodeType0Name')]", "properties": { @@ -625,7 +638,7 @@ "clusterEndpoint": "[reference(parameters('clusterName')).clusterEndpoint]", "nodeTypeRef": "[variables('vmNodeType0Name')]", "dataPath": "D:\\SvcFab", - "durabilityLevel": "Bronze", + "durabilityLevel": "Silver", "enableParallelJobs": true, "nicPrefixOverride": "[variables('subnet0Prefix')]", "certificate": { @@ -633,7 +646,7 @@ "x509StoreName": "[parameters('certificateStoreValue')]" } }, - "typeHandlerVersion": "1.0" + "typeHandlerVersion": "1.1" } }, { @@ -810,7 +823,7 @@ "startPort": "[variables('nt0applicationStartPort')]" }, "clientConnectionEndpointPort": "[variables('nt0fabricTcpGatewayPort')]", - "durabilityLevel": "Bronze", + "durabilityLevel": "Silver", "ephemeralPorts": { "endPort": "[variables('nt0ephemeralEndPort')]", "startPort": "[variables('nt0ephemeralStartPort')]" diff --git a/src/ServiceFabric/ServiceFabric.Test/Resources/templateCNCert.json b/src/ServiceFabric/ServiceFabric.Test/Resources/templateCNCert.json index 63af415adc3e..f2c24ac8f503 100644 --- a/src/ServiceFabric/ServiceFabric.Test/Resources/templateCNCert.json +++ b/src/ServiceFabric/ServiceFabric.Test/Resources/templateCNCert.json @@ -43,7 +43,7 @@ }, "vmImageSku": { "type": "string", - "defaultValue": "2022-Datacenter", + "defaultValue": "2022-datacenter-azure-edition", "metadata": { "description": "VM image SKU" } @@ -157,7 +157,7 @@ }, "vmNodeType0Size": { "type": "string", - "defaultValue": "Standard_D2_V2" + "defaultValue": "Standard_D2s_v3" } }, "variables": { @@ -177,12 +177,12 @@ "maxPercentUpgradeDomainDeltaUnhealthyNodes": "100", "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]", "overProvision": "false", - "vmssApiVersion": "2017-03-30", - "sfrpApiVersion": "2018-02-01", - "lbApiVersion": "2015-06-15", - "vNetApiVersion": "2015-06-15", - "storageApiVersion": "2016-01-01", - "publicIPApiVersion": "2015-06-15", + "vmssApiVersion": "2023-09-01", + "sfrpApiVersion": "2023-11-01-preview", + "lbApiVersion": "2023-09-01", + "vNetApiVersion": "2023-09-01", + "storageApiVersion": "2023-01-01", + "publicIPApiVersion": "2023-09-01", "nt0applicationStartPort": "20000", "nt0applicationEndPort": "30000", "nt0ephemeralStartPort": "49152", @@ -612,11 +612,24 @@ "properties": { "overprovision": "[variables('overProvision')]", "upgradePolicy": { - "mode": "Automatic" + "mode": "Automatic", + "automaticOSUpgradePolicy": { + "enableAutomaticOSUpgrade": true + } }, "virtualMachineProfile": { "extensionProfile": { "extensions": [ + { + "name": "Microsoft.Azure.Geneva.GenevaMonitoring", + "properties": { + "publisher": "Microsoft.Azure.Geneva", + "type": "GenevaMonitoring", + "typeHandlerVersion": "2.0", + "enableAutomaticUpgrade": true, + "autoUpgradeMinorVersion": true + } + }, { "name": "[concat('ServiceFabricNodeVmExt','_vmNodeType0Name')]", "properties": { @@ -631,7 +644,7 @@ "clusterEndpoint": "[reference(parameters('clusterName')).clusterEndpoint]", "nodeTypeRef": "[variables('vmNodeType0Name')]", "dataPath": "D:\\SvcFab", - "durabilityLevel": "Bronze", + "durabilityLevel": "Silver", "enableParallelJobs": true, "nicPrefixOverride": "[variables('subnet0Prefix')]", "certificate": { @@ -641,7 +654,7 @@ "x509StoreName": "[parameters('certificateStoreValue')]" } }, - "typeHandlerVersion": "1.0" + "typeHandlerVersion": "1.1" } }, { @@ -823,7 +836,7 @@ "startPort": "[variables('nt0applicationStartPort')]" }, "clientConnectionEndpointPort": "[variables('nt0fabricTcpGatewayPort')]", - "durabilityLevel": "Bronze", + "durabilityLevel": "Silver", "ephemeralPorts": { "endPort": "[variables('nt0ephemeralEndPort')]", "startPort": "[variables('nt0ephemeralStartPort')]"