zware/JFrog-Cloud-Installers
1
0
Fork 0
mirror of https://github.com/ZwareBear/JFrog-Cloud-Installers.git synced 2026-01-21 00:06:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Arm 7.11.2 (#68)

Browse Source 
* ARM templates - Postgresql JDBC driver is updated (for 7.10.2 compatibility)

* ARM templates - RT and JCR 7.10.2, Xray 3.9.1

* VM image publish template - RT 7.10.5

* ARM template for 7.10.5

* ARM template for Xray 3.10.3

* Updated artifactoryVersion and location

* Updated 7.10.5 version for JCR Azure application

* updated version on azuredeploy_ms_ps.json

* updated azuredeploy_ms_ps.json

* updated azuredeploy_ms_ps.json

* updated 7.10.6 verion in azuredeploy_ms_ps.json, MP_submission/createUiDefinition.json, MP_submission/mainTemplate.json

* Updated the Version for JCR

* updated new xray version 3.11.2 in template files

* updated new x-ray version in createUiDefinition.json mainTemplate.json

* updated createUiDefinition.json mainTemplate.json

* updated 7.11.2 changes for xray, rt and jcr

* ARM template, fixing formatting

Co-authored-by: danielmkn <danielmi@jfrog.com>
Co-authored-by: Aayush-sood94 <aayush.sood1@igtsolutions.com>
This commit is contained in:
Anup Singh
2020-12-02 23:28:06 +05:30
committed by GitHub
parent ddaa30af90
commit ccfb8c0383
20 changed files with 113 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AzureResourceManager/Xray/MP_submission/createUiDefinition.json
View File

@@ -123,7 +123,7 @@
"name": "xrayVersion",
"type": "Microsoft.Common.DropDown",
"label": "Xray-vm image version to deploy.",
"defaultValue": "3.9.1",
"defaultValue": "3.11.2",
"toolTip": "Version of Xray to deploy",
"constraints": {
"allowedValues": [
@@ -142,7 +142,13 @@
{
"label": "3.9.1",
"value": "0.0.6"
}
},
{
"label": "3.10.3",
"value": "0.0.7"
},
{ "label": "3.11.2", "value": "0.0.8"
}
],
"required": true
},
@@ -324,4 +330,4 @@
"db_password": "[steps('databaseConfig').db_password]"
}
}
}
}

12
AzureResourceManager/Xray/MP_submission/mainTemplate.json
View File

@@ -19,12 +19,14 @@
},
"xrayVersion": {
"type": "string",
"defaultValue": "0.0.6",
"defaultValue": "0.0.8",
"allowedValues": [
"0.0.3",
"0.0.4",
"0.0.5",
"0.0.6"
"0.0.6",
"0.0.7",
"0.0.8"
],
"metadata": {
"description": "Xray-vm image version to deploy."
@@ -275,7 +277,7 @@
},
{
"type": "Microsoft.Storage/storageAccounts",
"apiVersion": "2018-11-01",
"apiVersion": "2019-06-01",
"name": "[variables('storageAccountName')]",
"location": "[parameters('location')]",
"sku": {
@@ -320,7 +322,7 @@
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[concat(variables('namingInfix'), 'xrayScaleset')]",
"location": "[parameters('location')]",
"apiVersion": "2018-10-01",
"apiVersion": "2020-06-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]",
"[resourceId('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
@@ -401,4 +403,4 @@
}
}
]
}
}

2
AzureResourceManager/Xray/MP_submission/nested/Postgresql_deploy.json
View File

@@ -32,7 +32,7 @@
},
"skuSizeMB": {
"type": "int",
"defaultValue": 5120
"defaultValue": 204800
},
"skuTier": {
"type": "string",

28
AzureResourceManager/Xray/azuredeploy_xray.parameters.json
View File

@@ -3,19 +3,19 @@
"contentVersion": "1.0.0.0",
"parameters": {
"clusterName": {
"value": "GEN-UNIQUE"
"value": "GENERATE-CLUSTER-NAME"
},
"adminUsername": {
"value": "GEN-UNIQUE"
"value": "ADMIN-USERNAME"
},
"adminPassword": {
"value": "GEN-UNIQUE"
"value": "ADMIN-PASSWORD"
},
"virtualNetworkName": {
"value": "existing-vm-network-name"
"value": "EXISTING-VM-NETWORK-NAME"
},
"subnetName": {
"value": "existing-subnet-name"
"value": "EXISTING-SUBNET-NAME"
},
"virtualNetworkNewOrExisting": {
"value": "existing"
@@ -24,7 +24,7 @@
"value": "10.0.0.0/16"
},
"virtualNetworkResourceGroup": {
"value": "resource-group-name"
"value": "RESOURCE-GROUP-NAME"
},
"virtualMachineSize": {
"value": "Standard_D4s_v3"
@@ -33,25 +33,25 @@
"value": "10.0.1.0/24"
},
"xrayVersion": {
"value": "0.0.6"
"value": "0.0.8"
},
"artifactoryURL": {
"value": "http://artifactory-url.cloudapp.azure.com"
"value": "http://ARTIFACTORY-URL.cloudapp.azure.com"
},
"masterKey": {
"value": "GEN-UNIQUE"
"value": "GENERATE-MASTER-KEY"
},
"joinKey": {
"value": "GEN-UNIQUE"
"value": "GET-JOIN-KEY-IN-ARTIFACTORY-UI"
},
"db_type": {
"value": "Postgresql_existing.json"
"value": "Postgresql_deploy.json"
},
"db_user": {
"value": "GEN-UNIQUE"
"value": "DB-USERNAME"
},
"db_password": {
"value": "GEN-UNIQUE"
"value": "DB-PASSWORD"
},
"manual_db_url": {
"value": "jdbc:postgresql://postgressrvr.postgres.database.azure.com:5432"
@@ -60,4 +60,4 @@
"value": "postgressrvr"
}
}
}
}

12
AzureResourceManager/Xray/azuredeploy_xray_vmss.json
View File

@@ -19,12 +19,14 @@
},
"xrayVersion": {
"type": "string",
"defaultValue": "0.0.6",
"defaultValue": "0.0.8",
"allowedValues": [
"0.0.3",
"0.0.4",
"0.0.5",
"0.0.6"
"0.0.6",
"0.0.7",
"0.0.8"
],
"metadata": {
"description": "Xray-vm image version to deploy."
@@ -275,7 +277,7 @@
},
{
"type": "Microsoft.Storage/storageAccounts",
"apiVersion": "2018-11-01",
"apiVersion": "2019-06-01",
"name": "[variables('storageAccountName')]",
"location": "[parameters('location')]",
"sku": {
@@ -320,7 +322,7 @@
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[concat(variables('namingInfix'), 'xrayScaleset')]",
"location": "[parameters('location')]",
"apiVersion": "2018-10-01",
"apiVersion": "2020-06-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]",
"[resourceId('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
@@ -401,4 +403,4 @@
}
}
]
}
}

2
AzureResourceManager/Xray/nested/Postgresql_deploy.json
View File

@@ -32,7 +32,7 @@
},
"skuSizeMB": {
"type": "int",
"defaultValue": 5120
"defaultValue": 204800
},
"skuTier": {
"type": "string",

4
AzureResourceManager/Xray/vm_install/vm_parameters.json
View File

@@ -90,10 +90,10 @@
"value": "OWERWRITE_THE_PASSWORD"
},
"xrayVersion": {
"value": "3.9.1"
"value": "3.11.2"
},
"scriptName": {
"value": "install_xray_to_vm.sh"
}
}
}
}