From 096e90f1d3c714292ad924dbeb2279cf13cea581 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Thu, 1 Sep 2022 17:33:17 +0530 Subject: [PATCH] Changes in RT and Xray version 7.41.7 and 3.55.2 --- .../MP_submission/createUiDefinition.json | 6 +++++- .../Artifactory/MP_submission/mainTemplate.json | 11 ++++++----- .../MP_submission/nested/MSSQL_deploy.json | 8 ++++---- .../Artifactory/nested/MSSQL_deploy.json | 6 +++--- .../Xray/MP_submission/createUiDefinition.json | 6 +++++- .../Xray/MP_submission/mainTemplate.json | 17 +++++++++-------- 6 files changed, 32 insertions(+), 22 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index 35a6b45..e9e8a83 100644 --- a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json @@ -132,7 +132,7 @@ "name": "artifactoryVersion", "type": "Microsoft.Common.DropDown", "label": "Artifactory-vm image version to deploy.", - "defaultValue": "7.37.14", + "defaultValue": "7.41.7", "toolTip": "Version of Artifactory to deploy", "constraints": { "allowedValues": [ @@ -235,6 +235,10 @@ { "label": "7.37.14", "value": "0.0.40" + }, + { + "label": "7.41.7", + "value": "0.0.41" } ], "required": true diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index 6ef521c..696188e 100644 --- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json @@ -79,7 +79,7 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.40", + "defaultValue": "0.0.41", "allowedValues": [ "0.0.8", "0.0.9", @@ -105,7 +105,8 @@ "0.0.37", "0.0.38", "0.0.39", - "0.0.40" + "0.0.40", + "0.0.41" ], "metadata": { "description": "Artifactory-vm image version to deploy." @@ -749,7 +750,7 @@ { "type": "Microsoft.Resources/deployments", "name": "deploySQLDB", - "apiVersion": "2020-06-01", + "apiVersion": "2021-04-01", "properties": { "mode": "Incremental", "templateLink": { @@ -788,7 +789,7 @@ "type": "Microsoft.Compute/virtualMachineScaleSets", "name": "[variables('scaleSetPrimaryName')]", "location": "[parameters('location')]", - "apiVersion": "2020-06-01", + "apiVersion": "2021-11-01", "dependsOn": [ "[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]", "[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]", @@ -884,7 +885,7 @@ "type": "Microsoft.Compute/virtualMachineScaleSets", "name": "[variables('scaleSetMemberName')]", "location": "[parameters('location')]", - "apiVersion": "2020-06-01", + "apiVersion": "2021-11-01", "dependsOn": [ "[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]", "[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]", diff --git a/AzureResourceManager/Artifactory/MP_submission/nested/MSSQL_deploy.json b/AzureResourceManager/Artifactory/MP_submission/nested/MSSQL_deploy.json index 36a2309..7937874 100644 --- a/AzureResourceManager/Artifactory/MP_submission/nested/MSSQL_deploy.json +++ b/AzureResourceManager/Artifactory/MP_submission/nested/MSSQL_deploy.json @@ -47,7 +47,7 @@ "name": "[parameters('db_server')]", "type": "Microsoft.Sql/servers", "location": "[parameters('db_location')]", - "apiVersion": "2020-08-01-preview", + "apiVersion": "2021-11-01-preview", "tags": { "displayName": "artifactoryDB" }, @@ -61,7 +61,7 @@ "name": "[uniqueString(parameters('db_server'), 'AllowAllWindowsAzureIps' )]", "type": "firewallrules", "location": "[parameters('db_location')]", - "apiVersion": "2020-08-01-preview", + "apiVersion": "2021-11-01-preview", "dependsOn": [ "[resourceId('Microsoft.Sql/servers/', parameters('db_server'))]" ], @@ -75,7 +75,7 @@ "type": "databases", "kind": "v12.0,user", "location": "[parameters('db_location')]", - "apiVersion": "2020-08-01-preview", + "apiVersion": "2021-11-01-preview", "dependsOn": [ "[parameters('db_server')]" ], @@ -105,4 +105,4 @@ "value": "[parameters('databases')]" } } -} +} \ No newline at end of file diff --git a/AzureResourceManager/Artifactory/nested/MSSQL_deploy.json b/AzureResourceManager/Artifactory/nested/MSSQL_deploy.json index 36a2309..ed3b9a1 100644 --- a/AzureResourceManager/Artifactory/nested/MSSQL_deploy.json +++ b/AzureResourceManager/Artifactory/nested/MSSQL_deploy.json @@ -47,7 +47,7 @@ "name": "[parameters('db_server')]", "type": "Microsoft.Sql/servers", "location": "[parameters('db_location')]", - "apiVersion": "2020-08-01-preview", + "apiVersion": "2021-11-01-preview", "tags": { "displayName": "artifactoryDB" }, @@ -61,7 +61,7 @@ "name": "[uniqueString(parameters('db_server'), 'AllowAllWindowsAzureIps' )]", "type": "firewallrules", "location": "[parameters('db_location')]", - "apiVersion": "2020-08-01-preview", + "apiVersion": "2021-11-01-preview", "dependsOn": [ "[resourceId('Microsoft.Sql/servers/', parameters('db_server'))]" ], @@ -75,7 +75,7 @@ "type": "databases", "kind": "v12.0,user", "location": "[parameters('db_location')]", - "apiVersion": "2020-08-01-preview", + "apiVersion": "2021-11-01-preview", "dependsOn": [ "[parameters('db_server')]" ], diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json index 11dfd92..645a48c 100644 --- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json @@ -123,7 +123,7 @@ "name": "xrayVersion", "type": "Microsoft.Common.DropDown", "label": "Xray-vm image version to deploy.", - "defaultValue": "3.42.5", + "defaultValue": "3.55.2", "toolTip": "Version of Xray to deploy", "constraints": { "allowedValues": [ @@ -214,6 +214,10 @@ { "label": "3.42.5", "value": "0.0.34" + }, + { + "label": "3.55.2", + "value": "0.0.35" } ], "required": true diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json index d790a95..bd3f9ee 100644 --- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json @@ -19,7 +19,7 @@ }, "xrayVersion": { "type": "string", - "defaultValue": "0.0.34", + "defaultValue": "0.0.35", "allowedValues": [ "0.0.10", "0.0.11", @@ -42,7 +42,8 @@ "0.0.31", "0.0.32", "0.0.33", - "0.0.34" + "0.0.34", + "0.0.35" ], "metadata": { "description": "Xray-vm image version to deploy." @@ -221,7 +222,7 @@ }, "resources": [ { - "apiVersion": "2020-06-01", + "apiVersion": "2021-04-01", "name": "pid-650cbcf5-daa5-4038-88f1-aa87d58f8f1a-partnercenter", "type": "Microsoft.Resources/deployments", "properties": { @@ -236,7 +237,7 @@ { "condition": "[equals(parameters('virtualNetworkNewOrExisting'),'new')]", "type": "Microsoft.Network/virtualNetworks", - "apiVersion": "2020-05-01", + "apiVersion": "2022-05-01", "name": "[parameters('virtualNetworkName')]", "location": "[parameters('location')]", "properties": { @@ -258,7 +259,7 @@ { "type": "Microsoft.Network/publicIPAddresses", "name": "[variables('publicIPAddressName')]", - "apiVersion": "2020-05-01", + "apiVersion": "2022-05-01", "location": "[parameters('location')]", "properties": { "publicIPAllocationMethod": "[variables('publicIPAddressType')]" @@ -267,7 +268,7 @@ { "type": "Microsoft.Network/networkInterfaces", "name": "[variables('nicName')]", - "apiVersion": "2020-05-01", + "apiVersion": "2022-05-01", "location": "[parameters('location')]", "properties": { "ipConfigurations": [ @@ -305,7 +306,7 @@ { "type": "Microsoft.Resources/deployments", "name": "deploySQLDB", - "apiVersion": "2020-06-01", + "apiVersion": "2021-04-01", "properties": { "mode": "Incremental", "templateLink": { @@ -338,7 +339,7 @@ "type": "Microsoft.Compute/virtualMachineScaleSets", "name": "[concat(variables('namingInfix'), 'xrayScaleset')]", "location": "[parameters('location')]", - "apiVersion": "2020-06-01", + "apiVersion": "2022-08-01", "dependsOn": [ "[resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]", "[resourceId('Microsoft.Network/networkInterfaces/', variables('nicName'))]"