update default templates (Azure#26208)

* update default templates * update names and pass * update template values * update parameter name * add Platinum value
schaudhari6254888 · Oct 24, 2024 · 86546c6 · 86546c6
1 parent a632ad0
commit 86546c6
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 14 deletions.
diff --git a/src/ServiceFabric/ServiceFabric/Template/Windows/parameter.json b/src/ServiceFabric/ServiceFabric/Template/Windows/parameter.json
@@ -21,7 +21,7 @@
       "value": "WindowsServer"
     },
     "vmImageSku": {
-      "value": "2016-Datacenter-with-Containers"
+      "value": "2022-datacenter-azure-edition"
     },
     "vmImageVersion": {
       "value": "latest"
@@ -60,10 +60,10 @@
       "value": 5
     },
     "vmNodeType0Size": {
-      "value": "Standard_D2_V2"
+      "value": "Standard_D2s_v3"
     },
     "durabilityLevel": {
-      "value": "Bronze"
+      "value": "Silver"
     },
     "reliabilityLevel": {
       "value": "Silver"

diff --git a/src/ServiceFabric/ServiceFabric/Template/Windows/template.json b/src/ServiceFabric/ServiceFabric/Template/Windows/template.json
@@ -43,7 +43,7 @@
     },
     "vmImageSku": {
       "type": "string",
-      "defaultValue": "2016-Datacenter-with-Containers",
+      "defaultValue": "2022-datacenter-azure-edition",
       "metadata": {
         "description": "VM image SKU"
       }
@@ -151,14 +151,23 @@
     },
     "vmNodeType0Size": {
       "type": "string",
-      "defaultValue": "Standard_D2_V2"
+      "defaultValue": "Standard_D2s_v3"
     },
     "durabilityLevel": {
       "type": "string",
-      "defaultValue": "Bronze"
+      "allowedValues": [
+        "Silver",
+        "Gold"
+      ],
+      "defaultValue": "Silver"
     },
     "reliabilityLevel": {
       "type": "string",
+      "allowedValues": [
+        "Silver",
+        "Gold",
+        "Platinum"
+      ],
       "defaultValue": "Silver"
     }
   },
@@ -179,12 +188,12 @@
     "maxPercentUpgradeDomainDeltaUnhealthyNodes": "100",
     "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
     "overProvision": "false",
-    "vmssApiVersion": "2017-03-30",
-    "sfrpApiVersion": "2019-03-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",
@@ -614,11 +623,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": {
@@ -641,7 +663,7 @@
                       "x509StoreName": "[parameters('certificateStoreValue')]"
                     }
                   },
-                  "typeHandlerVersion": "1.0"
+                  "typeHandlerVersion": "1.1"
                 }
               },
               {