From 3fb401b2c316d9645c0ed403b7233ced726b54a7 Mon Sep 17 00:00:00 2001 From: danielmkn Date: Tue, 26 May 2020 10:59:18 -0700 Subject: [PATCH 1/2] ARM templates - VM size Standard_A2_v2 is removed because Rt doesn't start on this VM size anymore. --- AzureResourceManager/MP_submission_7/createUiDefinition.json | 1 - .../MP_submission_7/createUiDefinition.json | 3 +-- .../AzureResourceManager/MP_submission_7/mainTemplate.json | 2 +- JFrogContainerRegistry/AzureResourceManager/azuredeploy.json | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/AzureResourceManager/MP_submission_7/createUiDefinition.json b/AzureResourceManager/MP_submission_7/createUiDefinition.json index 3fcf134..b935f73 100644 --- a/AzureResourceManager/MP_submission_7/createUiDefinition.json +++ b/AzureResourceManager/MP_submission_7/createUiDefinition.json @@ -82,7 +82,6 @@ ], "constraints": { "allowedSizes": [ - "Standard_A2_v2", "Standard_A4_v2", "Standard_A4", "Standard_D2s_v3", diff --git a/JFrogContainerRegistry/AzureResourceManager/MP_submission_7/createUiDefinition.json b/JFrogContainerRegistry/AzureResourceManager/MP_submission_7/createUiDefinition.json index 4133a58..e61080f 100644 --- a/JFrogContainerRegistry/AzureResourceManager/MP_submission_7/createUiDefinition.json +++ b/JFrogContainerRegistry/AzureResourceManager/MP_submission_7/createUiDefinition.json @@ -78,11 +78,10 @@ "label": "Virtual machine size", "toolTip": "The size of the virtual machine for JFrog Container Registry", "recommendedSizes": [ - "Standard_A2_v2" + "Standard_D2s_v3" ], "constraints": { "allowedSizes": [ - "Standard_A2_v2", "Standard_A4_v2", "Standard_A4", "Standard_D2s_v3", diff --git a/JFrogContainerRegistry/AzureResourceManager/MP_submission_7/mainTemplate.json b/JFrogContainerRegistry/AzureResourceManager/MP_submission_7/mainTemplate.json index 348852a..bd39da3 100644 --- a/JFrogContainerRegistry/AzureResourceManager/MP_submission_7/mainTemplate.json +++ b/JFrogContainerRegistry/AzureResourceManager/MP_submission_7/mainTemplate.json @@ -4,7 +4,7 @@ "parameters": { "vmSku": { "type": "string", - "defaultValue": "Standard_A2_v2", + "defaultValue": "Standard_D2s_v3", "metadata": { "description": "Size of VMs in the VM Scale Set." } diff --git a/JFrogContainerRegistry/AzureResourceManager/azuredeploy.json b/JFrogContainerRegistry/AzureResourceManager/azuredeploy.json index 1f7cd5a..90fdd5d 100644 --- a/JFrogContainerRegistry/AzureResourceManager/azuredeploy.json +++ b/JFrogContainerRegistry/AzureResourceManager/azuredeploy.json @@ -4,7 +4,7 @@ "parameters": { "vmSku": { "type": "string", - "defaultValue": "Standard_A2_v2", + "defaultValue": "Standard_D2s_v3", "metadata": { "description": "Size of VMs in the VM Scale Set." } From 7cff30e44526dd46346085fe63b592b1ff501599 Mon Sep 17 00:00:00 2001 From: danielmkn Date: Tue, 26 May 2020 11:04:46 -0700 Subject: [PATCH 2/2] ARM templates - script link, branch replaced with master --- AzureResourceManager/azuredeploy.json | 2 +- JFrogContainerRegistry/AzureResourceManager/azuredeploy.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AzureResourceManager/azuredeploy.json b/AzureResourceManager/azuredeploy.json index 85db14e..e2bdccf 100644 --- a/AzureResourceManager/azuredeploy.json +++ b/AzureResourceManager/azuredeploy.json @@ -205,7 +205,7 @@ "metadata": { "description": "The base URI where artifacts required by this template are located. When the template is deployed using the accompanying scripts, a private location in the subscription will be used and this value will be automatically generated." }, - "defaultValue": "https://raw.githubusercontent.com/jfrog/JFrog-Cloud-Installers/refactoring-rt6-rt7/AzureResourceManager/" + "defaultValue": "https://raw.githubusercontent.com/jfrog/JFrog-Cloud-Installers/master/AzureResourceManager/" }, "_artifactsLocationSasToken": { "type": "securestring", diff --git a/JFrogContainerRegistry/AzureResourceManager/azuredeploy.json b/JFrogContainerRegistry/AzureResourceManager/azuredeploy.json index 90fdd5d..e6688ca 100644 --- a/JFrogContainerRegistry/AzureResourceManager/azuredeploy.json +++ b/JFrogContainerRegistry/AzureResourceManager/azuredeploy.json @@ -144,7 +144,7 @@ "metadata": { "description": "The base URI where artifacts required by this template are located. When the template is deployed using the accompanying scripts, a private location in the subscription will be used and this value will be automatically generated." }, - "defaultValue": "https://raw.githubusercontent.com/JFrogDev/JFrog-Cloud-Installers/refactoring-rt7/JFrogContainerRegistry/AzureResourceManager/" + "defaultValue": "https://raw.githubusercontent.com/JFrogDev/JFrog-Cloud-Installers/master/JFrogContainerRegistry/AzureResourceManager/" }, "_artifactsLocationSasToken": { "type": "securestring",