From 00b1196e1b09b7c79ab7b8adf2d2dbc1c942c7cd Mon Sep 17 00:00:00 2001 From: Anup Singh <64248163+anupteal@users.noreply.github.com> Date: Mon, 22 Mar 2021 21:56:12 +0530 Subject: [PATCH] ARM template, Artifactory 7.15.4, Xray 3.18.0 (#93) * updated * updated artifactory releas version 7.15.4 in createUiDefinition.json & mainTemplate.json file * updated version 7.15.4 in createUiDefinition.json file * updated version 7.15.4 in mainTemplate.json file * ARM templates. pid removed from all the templates per new MS requirements. RT 7.15.4, Xray 3.17.4, JSON docs aligned * updated all changes for artifactory version 7.15.4 & x-ray version 3.18.0 Co-authored-by: danielmkn --- .../MP_submission/createUiDefinition.json | 22 +++++++++++-------- .../MP_submission/mainTemplate.json | 18 +++------------ .../Artifactory/azuredeploy.json | 18 +++------------ .../Artifactory/vm_install/vm_parameters.json | 2 +- .../MP_submission_7/createUiDefinition.json | 6 ++--- .../JCR/MP_submission_7/mainTemplate.json | 15 +------------ AzureResourceManager/JCR/azuredeploy.json | 19 +++------------- .../MP_submission/createUiDefinition.json | 16 +++++++++----- .../Xray/MP_submission/mainTemplate.json | 22 +++++-------------- .../Xray/azuredeploy_xray.parameters.json | 2 +- .../Xray/azuredeploy_xray_vmss.json | 18 +++------------ .../Xray/vm_install/vm_parameters.json | 2 +- 12 files changed, 47 insertions(+), 113 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index 4d9db4c..7951a2b 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.15.3", + "defaultValue": "7.15.4", "toolTip": "Version of Artifactory to deploy", "constraints": { "allowedValues": [ @@ -140,18 +140,22 @@ "label": "7.12.5", "value": "0.0.8" }, - { + { "label": "7.12.6", "value": "0.0.9" }, - { + { "label": "7.12.8", - "value": "0.0.10" - }, - { - "label": "7.15.3", - "value": "0.0.11" - } + "value": "0.0.10" + }, + { + "label": "7.15.3", + "value": "0.0.11" + }, + { + "label": "7.15.4", + "value": "0.0.12" + } ], "required": true }, diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index 79604e7..ae98cfb 100644 --- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json @@ -79,12 +79,13 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.11", + "defaultValue": "0.0.12", "allowedValues": [ "0.0.8", "0.0.9", "0.0.10", - "0.0.11" + "0.0.11", + "0.0.12" ], "metadata": { "description": "Artifactory-vm image version to deploy." @@ -305,19 +306,6 @@ "nsgName": "[concat(variables('namingInfix'), 'nsg')]" }, "resources": [ - { - "apiVersion": "2019-05-01", - "name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef", - "type": "Microsoft.Resources/deployments", - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [] - } - } - }, { "type": "Microsoft.Network/networkSecurityGroups", "location": "[parameters('location')]", diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json index 28e3d81..7f605b1 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.json +++ b/AzureResourceManager/Artifactory/azuredeploy.json @@ -79,12 +79,13 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.11", + "defaultValue": "0.0.12", "allowedValues": [ "0.0.8", "0.0.9", "0.0.10", - "0.0.11" + "0.0.11", + "0.0.12" ], "metadata": { "description": "Artifactory-vm image version to deploy." @@ -305,19 +306,6 @@ "nsgName": "[concat(variables('namingInfix'), 'nsg')]" }, "resources": [ - { - "apiVersion": "2019-05-01", - "name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef", - "type": "Microsoft.Resources/deployments", - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [] - } - } - }, { "type": "Microsoft.Network/networkSecurityGroups", "location": "[parameters('location')]", diff --git a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json index 03f63db..78e7241 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json @@ -90,7 +90,7 @@ "value": "OWERWRITE_THE_PASSWORD" }, "artifactoryVersion": { - "value": "7.15.3" + "value": "7.15.4" }, "scriptName": { "value": "install_pro7_to_vm.sh" diff --git a/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json b/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json index 6d1e31b..d6daab8 100644 --- a/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json +++ b/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json @@ -137,10 +137,10 @@ "label": "7.11.2", "value": "0.0.61" }, - { + { "label": "7.12.8", - "value": "0.0.10" - } + "value": "0.0.10" + } ], "required": true }, diff --git a/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json b/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json index 0a83453..261f7e9 100644 --- a/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json +++ b/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json @@ -35,7 +35,7 @@ "0.0.4", "0.0.5", "0.0.61", - "0.0.10" + "0.0.10" ], "metadata": { "description": "JFrog Container Registry-vm image version to deploy." @@ -202,19 +202,6 @@ "nsgName": "[concat(variables('namingInfix'), 'nsg')]" }, "resources": [ - { - "apiVersion": "2019-05-01", - "name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef", - "type": "Microsoft.Resources/deployments", - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [] - } - } - }, { "type": "Microsoft.Network/networkSecurityGroups", "location": "[parameters('location')]", diff --git a/AzureResourceManager/JCR/azuredeploy.json b/AzureResourceManager/JCR/azuredeploy.json index 568b8fa..4f64e2c 100644 --- a/AzureResourceManager/JCR/azuredeploy.json +++ b/AzureResourceManager/JCR/azuredeploy.json @@ -33,10 +33,10 @@ "0.0.2", "0.0.3", "0.0.4", - "0.0.5", - "0.0.61", + "0.0.5", + "0.0.61", "0.0.7", - "0.0.10" + "0.0.10" ], "metadata": { "description": "JFrog Container Registry-vm image version to deploy." @@ -203,19 +203,6 @@ "nsgName": "[concat(variables('namingInfix'), 'nsg')]" }, "resources": [ - { - "apiVersion": "2019-05-01", - "name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef", - "type": "Microsoft.Resources/deployments", - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [] - } - } - }, { "type": "Microsoft.Network/networkSecurityGroups", "location": "[parameters('location')]", diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json index c0612b2..bb7694e 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.17.4", + "defaultValue": "3.18.0", "toolTip": "Version of Xray to deploy", "constraints": { "allowedValues": [ @@ -135,13 +135,17 @@ "label": "3.15.3", "value": "0.0.11" }, - { + { "label": "3.17.2", - "value": "0.0.13" - }, + "value": "0.0.13" + }, + { + "label": "3.17.4", + "value": "0.0.14" + }, { - "label": "3.17.4", - "value": "0.0.14" + "label": "3.18.0", + "value": "0.0.15" } ], "required": true diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json index 804ce43..0402c49 100644 --- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json @@ -19,12 +19,13 @@ }, "xrayVersion": { "type": "string", - "defaultValue": "0.0.14", + "defaultValue": "0.0.15", "allowedValues": [ "0.0.10", - "0.0.11", - "0.0.13", - "0.0.14" + "0.0.11", + "0.0.13", + "0.0.14", + "0.0.15" ], "metadata": { "description": "Xray-vm image version to deploy." @@ -202,19 +203,6 @@ "artifactoryURL": "[parameters('artifactoryURL')]" }, "resources": [ - { - "apiVersion": "2019-05-01", - "name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef", - "type": "Microsoft.Resources/deployments", - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [] - } - } - }, { "condition": "[equals(parameters('virtualNetworkNewOrExisting'),'new')]", "type": "Microsoft.Network/virtualNetworks", diff --git a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json index 9657c9d..e18b6d9 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.13" + "value": "0.0.15" }, "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 c3982e2..6a7a9e3 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json +++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json @@ -19,12 +19,13 @@ }, "xrayVersion": { "type": "string", - "defaultValue": "0.0.14", + "defaultValue": "0.0.15", "allowedValues": [ "0.0.10", "0.0.11", "0.0.13", - "0.0.14" + "0.0.14", + "0.0.15" ], "metadata": { "description": "Xray-vm image version to deploy." @@ -202,19 +203,6 @@ "artifactoryURL": "[parameters('artifactoryURL')]" }, "resources": [ - { - "apiVersion": "2019-05-01", - "name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef", - "type": "Microsoft.Resources/deployments", - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [] - } - } - }, { "condition": "[equals(parameters('virtualNetworkNewOrExisting'),'new')]", "type": "Microsoft.Network/virtualNetworks", diff --git a/AzureResourceManager/Xray/vm_install/vm_parameters.json b/AzureResourceManager/Xray/vm_install/vm_parameters.json index 536c520..41f88e6 100644 --- a/AzureResourceManager/Xray/vm_install/vm_parameters.json +++ b/AzureResourceManager/Xray/vm_install/vm_parameters.json @@ -90,7 +90,7 @@ "value": "OWERWRITE_THE_PASSWORD" }, "xrayVersion": { - "value": "3.17.4" + "value": "3.18.0" }, "scriptName": { "value": "install_xray_to_vm.sh"