Merge pull request #2586 from chintalavr/arcbox_3.0

Updated Arcbox 3.0 to fix issues
microsoft · Jun 23, 2024 · 6b83add · 6b83add
2 parents fdb5366 + beb4c46
commit 6b83add
Show file tree

Hide file tree

Showing 19 changed files with 1,363 additions and 208 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -31,7 +31,6 @@ assignees: ''
 
 **Have you looked at the Troubleshooting and Logs section?**
 <!---Relevant logs retrieval instructions can be found in the Troubleshooting section.
-- [Jumpstart ArcBox "Full" troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_arcbox/Full#basic-troubleshooting)
 - [Jumpstart ArcBox for IT Pros troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_arcbox/ITPro#basic-troubleshooting)
 - [Jumpstart ArcBox for DevOps troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_arcbox/DevOps#basic-troubleshooting)
 - [Jumpstart ArcBox for DataOps troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_arcbox/DataOps#basic-troubleshooting)

diff --git a/azure_jumpstart_arcbox/ARM/azuredeploy.json b/azure_jumpstart_arcbox/ARM/azuredeploy.json
@@ -52,12 +52,11 @@
         "description": "The flavor of ArcBox you want to deploy. Valid values are: 'Full', 'ITPro', 'DevOps', 'DataOps'"
       },
       "allowedValues": [
-        "Full",
         "ITPro",
         "DevOps",
         "DataOps"
       ],
-      "defaultValue": "Full"
+      "defaultValue": "ITPro"
     },
     "githubAccount": {
       "type": "string",

diff --git a/azure_jumpstart_arcbox/ARM/azuredeploy.parameters.json b/azure_jumpstart_arcbox/ARM/azuredeploy.parameters.json
@@ -24,7 +24,7 @@
             "value": "<your unique Log Analytics workspace name>"
         },
         "flavor": {
-            "value": "Full"
+            "value": "ITPro"
         },
         "deployBastion": {
             "value": false

diff --git a/azure_jumpstart_arcbox/ARM/azuredeploywithroleassignments.json b/azure_jumpstart_arcbox/ARM/azuredeploywithroleassignments.json
@@ -52,11 +52,10 @@
         "description": "The flavor of ArcBox you want to deploy. Valid values are: 'Full', 'ITPro', 'DevOps'"
       },
       "allowedValues": [
-        "Full",
         "ITPro",
         "DevOps"
       ],
-      "defaultValue": "Full"
+      "defaultValue": "ITPro"
     },
     "githubAccount": {
       "type": "string",

diff --git a/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json b/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json
@@ -167,8 +167,8 @@
             "metadata": {
                 "description": "The flavor of ArcBox you want to deploy. Valid values are: 'Full', 'ITPro'"
             },
-            "allowedValues": [ "Full", "ITPro", "DevOps", "DataOps" ],
-            "defaultValue": "Full"
+            "allowedValues": [ "ITPro", "DevOps", "DataOps" ],
+            "defaultValue": "ITPro"
         },
         "deployBastion": {
             "type": "bool",
@@ -248,7 +248,7 @@
                                 "id": "[variables('subnetRef')]"
                             },
                             "privateIPAllocationMethod": "Dynamic",
-                            "publicIpAddress": "[if(not(parameters('deployBastion')),variables('PublicIPNoBastion'),null)]"
+                            "publicIpAddress": "[if(not(parameters('deployBastion')),variables('PublicIPNoBastion'),json('null'))]"
                         }
                     }
                 ]
@@ -276,6 +276,9 @@
             "name": "[variables('vmName')]",
             "location": "[parameters('location')]",
             "tags": "[parameters('resourceTags')]",
+            "identity": {
+                "type": "SystemAssigned"
+            },
             "dependsOn": [
                 "[resourceId('Microsoft.Network/networkInterfaces/', variables('networkInterfaceName'))]"
             ],
@@ -341,9 +344,22 @@
                     "commandToExecute": "[concat('powershell.exe -ExecutionPolicy Bypass -File Bootstrap.ps1', ' -adminUsername ', parameters('windowsAdminUsername'), ' -adminPassword ' , parameters('windowsAdminPassword'), ' -spnClientId ', parameters('spnClientId'), ' -spnClientSecret ', parameters('spnClientSecret'), ' -spnTenantId ', parameters('spnTenantId'), ' -spnAuthority ', parameters('spnAuthority'), ' -subscriptionId ', subscription().subscriptionId, ' -resourceGroup ', resourceGroup().name, ' -azdataUsername ', parameters('azdataUsername'), ' -azdataPassword ', parameters('azdataPassword'), ' -acceptEula ', parameters('acceptEula'), ' -registryUsername ', parameters('registryUsername'), ' -registryPassword ', parameters('registryPassword'), ' -arcDcName ', parameters('arcDcName'), ' -azureLocation ', parameters('location'), ' -mssqlmiName ', parameters('mssqlmiName'), ' -POSTGRES_NAME ', parameters('postgresName'), ' -POSTGRES_WORKER_NODE_COUNT ', parameters('postgresWorkerNodeCount'), ' -POSTGRES_DATASIZE ', parameters('postgresDatasize'), ' -POSTGRES_SERVICE_TYPE ', parameters('postgresServiceType'), ' -stagingStorageAccountName ', parameters('stagingStorageAccountName'), ' -workspaceName ', parameters('workspaceName'), ' -capiArcDataClusterName ', parameters('capiArcDataClusterName'), ' -templateBaseUrl ', parameters('templateBaseUrl'), ' -flavor ', parameters('flavor'), ' -k3sArcClusterName ', parameters('k3sArcClusterName'), ' -aksArcClusterName ', parameters('aksArcClusterName') , ' -aksdrArcClusterName ', parameters('aksdrArcClusterName') , ' -githubUser ', parameters('githubUser'), ' -rdpPort ', parameters('rdpPort'), ' -sshPort ', parameters('sshPort'))]"
                 }
             }
+        },
+        {
+            "type": "Microsoft.Authorization/roleAssignments",
+            "apiVersion": "2022-04-01",
+            "name": "[guid(variables('vmName'), 'Microsoft.Authorization/roleAssignments', 'Owner')]",
+            "properties": {
+                "roleDefinitionId": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')]",
+                "principalId": "[reference(resourceId('Microsoft.Compute/virtualMachines', variables('vmName')), '2019-07-01', 'Full').identity.principalId]"            },
+            "dependsOn": [
+                "[resourceId('Microsoft.Compute/virtualMachines', variables('vmName'))]"
+            ],
+            "metadata": {
+                "description": "Assigns Client VM managed identity Owner Role at resource group level"
+            }
         }
     ],
-
     "outputs": {
         "adminUsername": {
             "type": "string",

diff --git a/azure_jumpstart_arcbox/ARM/kubernetes/ubuntuCapi.json b/azure_jumpstart_arcbox/ARM/kubernetes/ubuntuCapi.json
@@ -122,7 +122,6 @@
                 "description": "The flavor of ArcBox you want to deploy. Valid values are: 'Full', 'ITPro', 'DevOps'"
             },
             "allowedValues": [
-                "Full",
                 "ITPro",
                 "DevOps",
                 "DataOps"

diff --git a/azure_jumpstart_arcbox/ARM/mgmt/mgmtArtifacts.json b/azure_jumpstart_arcbox/ARM/mgmt/mgmtArtifacts.json
@@ -598,6 +598,6 @@
           }
         ]
       }
-    }
+    }  
   ]
 }
diff --git a/azure_jumpstart_arcbox/ARM/mgmt/policyAzureArcBuiltins.json b/azure_jumpstart_arcbox/ARM/mgmt/policyAzureArcBuiltins.json
@@ -27,7 +27,6 @@
                 "name": "(ArcBox) Enable Azure Monitor for Hybrid VMs with AMA",
                 "definitionId": "/providers/Microsoft.Authorization/policySetDefinitions/59e9c3eb-d8df-473b-8059-23fd38ddd0f0",
                 "flavors": [
-                    "Full",
                     "ITPro",
                     "DataOps"
                 ],
@@ -49,7 +48,6 @@
                 "name": "(ArcBox) Tag resources",
                 "definitionId": "/providers/Microsoft.Authorization/policyDefinitions/4f9dc7db-30c1-420c-b61a-e1d640128d26",
                 "flavors": [
-                    "Full",
                     "ITPro",
                     "DevOps",
                     "DataOps"
@@ -68,7 +66,6 @@
                 "name": "(ArcBox) Enable Microsoft Defender on Kubernetes clusters",
                 "definitionId": "/providers/Microsoft.Authorization/policyDefinitions/708b60a6-d253-4fe0-9114-4be4c00f012c",
                 "flavors": [
-                    "Full",
                     "DevOps"
                 ],
                 "roleDefinition": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')]",
-Original file line number
+Diff line change
@@ Expand Up / @@ -598,6 +598,6 @@ @@
               }
             ]
           }
-        }
+        }
       ]
     }