diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index e91512a..76ebfdd 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.7.3", + "defaultValue": "7.10.2", "toolTip": "Version of Artifactory to deploy", "constraints": { "allowedValues": [ @@ -167,6 +167,10 @@ { "label": "7.7.3", "value": "0.0.2" + }, + { + "label": "7.10.2", + "value": "0.0.3" } ], "required": true diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index 76b323c..cb86554 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.2", + "defaultValue": "0.0.3", "allowedValues": [ "6.6.0", "6.6.1", @@ -95,7 +95,8 @@ "7.4.3", "7.4.30", "0.0.1", - "0.0.2" + "0.0.2", + "0.0.3" ], "metadata": { "description": "Artifactory-vm image version to deploy." diff --git a/AzureResourceManager/Artifactory/azuredeploy_ms_ps.json b/AzureResourceManager/Artifactory/azuredeploy_ms_ps.json index 7ae66b3..9b2399a 100644 --- a/AzureResourceManager/Artifactory/azuredeploy_ms_ps.json +++ b/AzureResourceManager/Artifactory/azuredeploy_ms_ps.json @@ -79,26 +79,21 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.2", + "defaultValue": "0.0.3", "allowedValues": [ - "6.6.0", - "6.6.1", - "6.7.0", - "6.8.0", "6.11.3", "6.15.0", "0.16.0", "0.17.0", "6.18.0", - "7.0.0717", - "7.0.4001", "7.2.1", "7.4.3", "7.4.30", "7.4.31", "7.5.7", "0.0.1", - "0.0.2" + "0.0.2", + "0.0.3" ], "metadata": { "description": "Artifactory-vm image version to deploy." diff --git a/AzureResourceManager/Artifactory/vm_install/vm_deploy.json b/AzureResourceManager/Artifactory/vm_install/vm_deploy.json index f131e70..2d8053b 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_deploy.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_deploy.json @@ -41,9 +41,6 @@ "virtualMachineComputerName": { "type": "String" }, - "diskNameSalt": { - "type": "String" - }, "storageAccountName": { "type": "String" }, diff --git a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json index 9049765..8241d9c 100644 --- a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json +++ b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json @@ -64,9 +64,6 @@ "virtualMachineComputerName": { "value": "rtvm" }, - "diskNameSalt": { - "value": "20200824153005" - }, "storageAccountName": { "value": "mpstoragevhd" }, diff --git a/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json b/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json index 990c3ba..0918f67 100644 --- a/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json +++ b/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json @@ -101,7 +101,7 @@ "name": "artifactoryVersion", "type": "Microsoft.Common.DropDown", "label": "JFrog Container Registry-vm image version to deploy.", - "defaultValue": "7.7.3", + "defaultValue": "7.10.2", "toolTip": "Version of JFrog Container Registry to deploy", "constraints": { "allowedValues": [ @@ -120,6 +120,10 @@ { "label": "7.7.3", "value": "0.0.2" + }, + { + "label": "7.10.2", + "value": "0.0.3" } ], "required": true diff --git a/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json b/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json index 8456a9e..6277267 100644 --- a/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json +++ b/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json @@ -25,12 +25,13 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.2", + "defaultValue": "0.0.3", "allowedValues": [ "7.2.1", "7.3.2", "7.4.3", - "0.0.2" + "0.0.2", + "0.0.3" ], "metadata": { "description": "JFrog Container Registry-vm image version to deploy." diff --git a/AzureResourceManager/JCR/azuredeploy.json b/AzureResourceManager/JCR/azuredeploy.json index a2cc4f9..b1ec59b 100644 --- a/AzureResourceManager/JCR/azuredeploy.json +++ b/AzureResourceManager/JCR/azuredeploy.json @@ -25,12 +25,13 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.2", + "defaultValue": "0.0.3", "allowedValues": [ "7.2.1", "7.3.2", "7.4.3", - "0.0.2" + "0.0.2", + "0.0.3" ], "metadata": { "description": "JFrog Container Registry-vm image version to deploy." diff --git a/AzureResourceManager/JCR/vm_install/vm_deploy.json b/AzureResourceManager/JCR/vm_install/vm_deploy.json index 035a169..b6e6977 100644 --- a/AzureResourceManager/JCR/vm_install/vm_deploy.json +++ b/AzureResourceManager/JCR/vm_install/vm_deploy.json @@ -5,11 +5,8 @@ "location": { "type": "String" }, - "networkInterfaceName": { - "type": "String" - }, - "networkSecurityGroupName": { - "type": "String" + "namingInfix": { + "type": "string" }, "networkSecurityGroupRules": { "type": "Array" @@ -17,18 +14,12 @@ "subnetName": { "type": "String" }, - "virtualNetworkName": { - "type": "String" - }, "addressPrefixes": { "type": "Array" }, "subnets": { "type": "Array" }, - "publicIpAddressName": { - "type": "String" - }, "publicIpAddressType": { "type": "String" }, @@ -91,8 +82,12 @@ } }, "variables": { - "nsgId": "[resourceId(resourceGroup().name, 'Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroupName'))]", - "vnetId": "[resourceId(resourceGroup().name,'Microsoft.Network/virtualNetworks', parameters('virtualNetworkName'))]", + "networkInterfaceName": "[concat(parameters('namingInfix'), '-nic')]", + "networkSecurityGroupName": "[concat(parameters('namingInfix'), '-nsg')]", + "virtualNetworkName": "[concat(parameters('namingInfix'), '-vnet')]", + "publicIpAddressName": "[concat(parameters('namingInfix'), '-public-ip')]", + "nsgId": "[resourceId(resourceGroup().name, 'Microsoft.Network/networkSecurityGroups', variables('networkSecurityGroupName'))]", + "vnetId": "[resourceId(resourceGroup().name,'Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]", "subnetRef": "[concat(variables('vnetId'), '/subnets/', parameters('subnetName'))]", "storageContainerUri": "[concat(concat('https://', parameters('storageAccountName'), '.blob.core.windows.net/'), 'vhds/')]", "scriptName": "[parameters('scriptName')]", @@ -105,12 +100,12 @@ { "type": "Microsoft.Network/networkInterfaces", "apiVersion": "2019-07-01", - "name": "[parameters('networkInterfaceName')]", + "name": "[variables('networkInterfaceName')]", "location": "[parameters('location')]", "dependsOn": [ - "[concat('Microsoft.Network/networkSecurityGroups/', parameters('networkSecurityGroupName'))]", - "[concat('Microsoft.Network/virtualNetworks/', parameters('virtualNetworkName'))]", - "[concat('Microsoft.Network/publicIpAddresses/', parameters('publicIpAddressName'))]" + "[concat('Microsoft.Network/networkSecurityGroups/', variables('networkSecurityGroupName'))]", + "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]", + "[concat('Microsoft.Network/publicIpAddresses/', variables('publicIpAddressName'))]" ], "properties": { "ipConfigurations": [ @@ -122,7 +117,7 @@ }, "privateIPAllocationMethod": "Dynamic", "publicIpAddress": { - "id": "[resourceId(resourceGroup().name, 'Microsoft.Network/publicIpAddresses', parameters('publicIpAddressName'))]" + "id": "[resourceId(resourceGroup().name, 'Microsoft.Network/publicIpAddresses', variables('publicIpAddressName'))]" } } } @@ -135,7 +130,7 @@ { "type": "Microsoft.Network/networkSecurityGroups", "apiVersion": "2019-02-01", - "name": "[parameters('networkSecurityGroupName')]", + "name": "[variables('networkSecurityGroupName')]", "location": "[parameters('location')]", "properties": { "securityRules": "[parameters('networkSecurityGroupRules')]" @@ -144,7 +139,7 @@ { "type": "Microsoft.Network/virtualNetworks", "apiVersion": "2019-09-01", - "name": "[parameters('virtualNetworkName')]", + "name": "[variables('virtualNetworkName')]", "location": "[parameters('location')]", "properties": { "addressSpace": { @@ -156,7 +151,7 @@ { "type": "Microsoft.Network/publicIpAddresses", "apiVersion": "2019-02-01", - "name": "[parameters('publicIpAddressName')]", + "name": "[variables('publicIpAddressName')]", "location": "[parameters('location')]", "sku": { "name": "[parameters('publicIpAddressSku')]" @@ -171,7 +166,7 @@ "name": "[parameters('virtualMachineName')]", "location": "[parameters('location')]", "dependsOn": [ - "[concat('Microsoft.Network/networkInterfaces/', parameters('networkInterfaceName'))]", + "[concat('Microsoft.Network/networkInterfaces/', variables('networkInterfaceName'))]", "[concat('Microsoft.Storage/storageAccounts/', parameters('diagnosticsStorageAccountName'))]" ], "properties": { @@ -196,7 +191,7 @@ "networkProfile": { "networkInterfaces": [ { - "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaceName'))]" + "id": "[resourceId('Microsoft.Network/networkInterfaces', variables('networkInterfaceName'))]" } ] }, diff --git a/AzureResourceManager/JCR/vm_install/vm_parameters.json b/AzureResourceManager/JCR/vm_install/vm_parameters.json index 41388d6..58c512d 100644 --- a/AzureResourceManager/JCR/vm_install/vm_parameters.json +++ b/AzureResourceManager/JCR/vm_install/vm_parameters.json @@ -5,11 +5,8 @@ "location": { "value": "westus2" }, - "networkInterfaceName": { - "value": "jcr-nic" - }, - "networkSecurityGroupName": { - "value": "jcr-nsg" + "namingInfix": { + "value": "jcr" }, "networkSecurityGroupRules": { "value": [ @@ -31,9 +28,6 @@ "subnetName": { "value": "default" }, - "virtualNetworkName": { - "value": "jcr-vm-test-vnet" - }, "addressPrefixes": { "value": [ "10.0.0.0/24" @@ -49,9 +43,6 @@ } ] }, - "publicIpAddressName": { - "value": "jcr-public-ip" - }, "publicIpAddressType": { "value": "Dynamic" }, diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json index d4ca300..88e3488 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.8.5", + "defaultValue": "3.9.1", "toolTip": "Version of Xray to deploy", "constraints": { "allowedValues": [ @@ -138,6 +138,10 @@ { "label": "3.8.5", "value": "0.0.5" + }, + { + "label": "3.9.1", + "value": "0.0.6" } ], "required": true diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json index 4d0b228..15bf701 100644 --- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json @@ -19,11 +19,12 @@ }, "xrayVersion": { "type": "string", - "defaultValue": "0.0.5", + "defaultValue": "0.0.6", "allowedValues": [ "0.0.3", "0.0.4", - "0.0.5" + "0.0.5", + "0.0.6" ], "metadata": { "description": "Xray-vm image version to deploy." diff --git a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json index 7979be9..2f18bb9 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.4" + "value": "0.0.6" }, "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 e8c4339..a16eb18 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json +++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json @@ -19,11 +19,12 @@ }, "xrayVersion": { "type": "string", - "defaultValue": "0.0.5", + "defaultValue": "0.0.6", "allowedValues": [ "0.0.3", "0.0.4", - "0.0.5" + "0.0.5", + "0.0.6" ], "metadata": { "description": "Xray-vm image version to deploy." diff --git a/AzureResourceManager/Xray/vm_install/vm_parameters.json b/AzureResourceManager/Xray/vm_install/vm_parameters.json index 2d58ea8..77992f8 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" }, "artifactoryVersion": { - "value": "3.8.5" + "value": "3.9.1" }, "scriptName": { "value": "install_xray_to_vm.sh"