From 217520384a7b4227c228e8dc09ba25503643bc73 Mon Sep 17 00:00:00 2001
From: Seif Bassem <38246040+sebassem@users.noreply.github.com>
Date: Wed, 24 Jul 2024 10:24:10 +0300
Subject: [PATCH 1/2] chore: Remove explicit tags from bicep files

---
 azure_jumpstart_arcbox/bicep/kubernetes/ubuntuRancher.bicep  | 5 -----
 .../bicep/kubernetes/ubuntuRancherNodes.bicep                | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/azure_jumpstart_arcbox/bicep/kubernetes/ubuntuRancher.bicep b/azure_jumpstart_arcbox/bicep/kubernetes/ubuntuRancher.bicep
index 6ede81154e..0ee4eed635 100644
--- a/azure_jumpstart_arcbox/bicep/kubernetes/ubuntuRancher.bicep
+++ b/azure_jumpstart_arcbox/bicep/kubernetes/ubuntuRancher.bicep
@@ -23,10 +23,6 @@ param vmSize string = 'Standard_B4ms'
 @description('Resource Id of the subnet in the virtual network')
 param subnetId string
 
-param resourceTags object = {
-  Project: 'jumpstart_arcbox'
-}
-
 @description('Name for the staging storage account using to hold kubeconfig. This value is passed into the template as an output from mgmtStagingStorage.json')
 param stagingStorageAccountName string
 
@@ -92,7 +88,6 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-01-01' = {
 resource vm 'Microsoft.Compute/virtualMachines@2022-03-01' = {
   name: vmName
   location: azureLocation
-  tags: resourceTags
   identity: {
     type: 'SystemAssigned'
   }
diff --git a/azure_jumpstart_arcbox/bicep/kubernetes/ubuntuRancherNodes.bicep b/azure_jumpstart_arcbox/bicep/kubernetes/ubuntuRancherNodes.bicep
index 8ce99236b8..8a5846f8d6 100644
--- a/azure_jumpstart_arcbox/bicep/kubernetes/ubuntuRancherNodes.bicep
+++ b/azure_jumpstart_arcbox/bicep/kubernetes/ubuntuRancherNodes.bicep
@@ -20,10 +20,6 @@ param azureLocation string = resourceGroup().location
 @description('Resource Id of the subnet in the virtual network')
 param subnetId string
 
-param resourceTags object = {
-  Project: 'jumpstart_arcbox'
-}
-
 @description('Name for the staging storage account using to hold kubeconfig. This value is passed into the template as an output from mgmtStagingStorage.json')
 param stagingStorageAccountName string
 
@@ -70,7 +66,6 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-01-01' = {
 resource vm 'Microsoft.Compute/virtualMachines@2022-03-01' = {
   name: vmName
   location: azureLocation
-  tags: resourceTags
   identity: {
     type: 'SystemAssigned'
   }

From 860d3dd7ad61698de39a39b2c41a10846d21a5ae Mon Sep 17 00:00:00 2001
From: Seif Bassem <38246040+sebassem@users.noreply.github.com>
Date: Wed, 24 Jul 2024 15:32:53 +0300
Subject: [PATCH 2/2] chore: Update customLocationRPOID parameter default value
 in main.bicep

---
 azure_jumpstart_arcbox/bicep/main.bicep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure_jumpstart_arcbox/bicep/main.bicep b/azure_jumpstart_arcbox/bicep/main.bicep
index 2972a3af22..54aded97c5 100644
--- a/azure_jumpstart_arcbox/bicep/main.bicep
+++ b/azure_jumpstart_arcbox/bicep/main.bicep
@@ -61,7 +61,7 @@ param guid string = substring(newGuid(),0,4)
 param location string = resourceGroup().location
 
 @description('The custom location RPO ID. This parameter is only needed when deploying the DataOps flavor.')
-param customLocationRPOID string = ''
+param customLocationRPOID string = newGuid()
 
 @description('Tags to assign for all ArcBox resources')
 param resourceTags object = {