From 0db9211fa0bfe24ba70a0e14f22cf4c14b00d439 Mon Sep 17 00:00:00 2001 From: Anup Singh <64248163+anupteal@users.noreply.github.com> Date: Tue, 8 Jun 2021 23:40:13 +0530 Subject: [PATCH] Arm 7.19.4 (#126) * Updated added -preview azuredeploy_xray_vmss.json & azuredeploy.json * Update azuredeploy_xray.parameters.json * updated all require changes done for Artifactory 7.19.4 & X-ray 3.25.1 * updated api version in mainTemplate.json & remove -preview from azuredeploy_xray_vmss.json --- .../Artifactory/MP_submission/createUiDefinition.json | 6 +++++- .../Artifactory/MP_submission/mainTemplate.json | 7 ++++--- AzureResourceManager/Artifactory/azuredeploy.json | 5 +++-- .../Xray/MP_submission/createUiDefinition.json | 6 +++++- AzureResourceManager/Xray/MP_submission/mainTemplate.json | 7 ++++--- AzureResourceManager/Xray/azuredeploy_xray.parameters.json | 2 +- AzureResourceManager/Xray/azuredeploy_xray_vmss.json | 5 +++-- 7 files changed, 25 insertions(+), 13 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index c252e47..cc02bdd 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.18.6", + "defaultValue": "7.19.4", "toolTip": "Version of Artifactory to deploy", "constraints": { "allowedValues": [ @@ -167,6 +167,10 @@ { "label": "7.18.6", "value": "0.0.18" + }, + { + "label": "7.19.4", + "value": "0.0.19" } ], "required": true diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index e341b22..ce71956 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.18", + "defaultValue": "0.0.19", "allowedValues": [ "0.0.8", "0.0.9", @@ -88,7 +88,8 @@ "0.0.12", "0.0.14", "0.0.15", - "0.0.18" + "0.0.18", + "0.0.19" ], "metadata": { "description": "Artifactory-vm image version to deploy." @@ -702,7 +703,7 @@ } }, { - "apiVersion": "2019-06-01", + "apiVersion": "2021-02-01", "type": "Microsoft.Storage/storageAccounts", "name": "[variables('storageAccountName')]", "location": "[parameters('location')]", diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json index 5e5c37b..2c6082b 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.json +++ b/AzureResourceManager/Artifactory/azuredeploy.json @@ -79,7 +79,7 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.18", + "defaultValue": "0.0.19", "allowedValues": [ "0.0.8", "0.0.9", @@ -88,7 +88,8 @@ "0.0.12", "0.0.14", "0.0.15", - "0.0.18" + "0.0.18", + "0.0.19" ], "metadata": { "description": "Artifactory-vm image version to deploy." diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json index 8d0fea5..df4dfa2 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.24.2", + "defaultValue": "3.25.1", "toolTip": "Version of Xray to deploy", "constraints": { "allowedValues": [ @@ -162,6 +162,10 @@ { "label": "3.24.2", "value": "0.0.21" + }, + { + "label": "3.25.1", + "value": "0.0.22" } ], "required": true diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json index 1043535..c9ffacc 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.21", + "defaultValue": "0.0.22", "allowedValues": [ "0.0.10", "0.0.11", @@ -29,7 +29,8 @@ "0.0.17", "0.0.18", "0.0.20", - "0.0.21" + "0.0.21", + "0.0.22" ], "metadata": { "description": "Xray-vm image version to deploy." @@ -267,7 +268,7 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2019-06-01", + "apiVersion": "2021-02-01", "name": "[variables('storageAccountName')]", "location": "[parameters('location')]", "sku": { diff --git a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json index 859ec7b..5e76760 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json +++ b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json @@ -33,7 +33,7 @@ "value": "10.0.1.0/24" }, "xrayVersion": { - "value": "0.0.21" + "value": "0.0.22" }, "artifactoryURL": { "value": "http://ARTIFACTORY-URL.cloudapp.azure.com" diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json index 37e1a49..ff2501e 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json +++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json @@ -19,7 +19,7 @@ }, "xrayVersion": { "type": "string", - "defaultValue": "0.0.21", + "defaultValue": "0.0.22", "allowedValues": [ "0.0.10", "0.0.11", @@ -29,7 +29,8 @@ "0.0.17", "0.0.18", "0.0.20", - "0.0.21" + "0.0.21", + "0.0.22" ], "metadata": { "description": "Xray-vm image version to deploy."