Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arcbox 3.0 #2604

Merged
merged 3 commits into from
Jul 9, 2024
Merged

Arcbox 3.0 #2604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7917b89
fixed rbac
sebassem Jul 9, 2024
d3dfdf2
Merge branch 'arcbox_3.0' of https://github.com/sebassem/azure_arc in…
sebassem Jul 9, 2024
4682cbe
Merge branch 'microsoft:arcbox_3.0' into arcbox_3.0
sebassem Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions azure_jumpstart_arcbox/ARM/azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.28.1.47646",
"templateHash": "15004056108128901746"
"templateHash": "13401064883874791691"
}
},
"parameters": {
Expand Down Expand Up @@ -1094,7 +1094,7 @@
"_generator": {
"name": "bicep",
"version": "0.28.1.47646",
"templateHash": "7748500223683903108"
"templateHash": "22323604518571401"
}
},
"parameters": {
Expand Down Expand Up @@ -1474,7 +1474,8 @@
"name": "[guid(resourceId('Microsoft.Compute/virtualMachines', parameters('vmName')), 'Microsoft.Authorization/roleAssignments', 'Administrator')]",
"properties": {
"principalId": "[reference(resourceId('Microsoft.Compute/virtualMachines', parameters('vmName')), '2022-03-01', 'full').identity.principalId]",
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', '00482a5a-887f-4fb3-b363-3b7fe8e74483')]"
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', '00482a5a-887f-4fb3-b363-3b7fe8e74483')]",
"principalType": "ServicePrincipal"
},
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines', parameters('vmName'))]"
Expand All @@ -1486,7 +1487,8 @@
"name": "[guid(resourceId('Microsoft.Compute/virtualMachines', parameters('vmName')), 'Microsoft.Authorization/roleAssignments', 'Owner')]",
"properties": {
"principalId": "[reference(resourceId('Microsoft.Compute/virtualMachines', parameters('vmName')), '2022-03-01', 'full').identity.principalId]",
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')]"
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')]",
"principalType": "ServicePrincipal"
},
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines', parameters('vmName'))]"
Expand Down Expand Up @@ -8413,7 +8415,7 @@
"_generator": {
"name": "bicep",
"version": "0.28.1.47646",
"templateHash": "16902719430194420979"
"templateHash": "5843142477636067178"
}
},
"parameters": {
Expand Down Expand Up @@ -8631,7 +8633,8 @@
"name": "[guid(resourceId('Microsoft.ContainerService/managedClusters', parameters('aksClusterName')), 'Microsoft.Authorization/roleAssignments', 'Owner')]",
"properties": {
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', parameters('aksClusterName')), '2023-10-02-preview', 'full').identity.principalId]",
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')]"
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')]",
"principalType": "ServicePrincipal"
},
"dependsOn": [
"[resourceId('Microsoft.ContainerService/managedClusters', parameters('aksClusterName'))]"
Expand All @@ -8643,7 +8646,8 @@
"name": "[guid(resourceId('Microsoft.ContainerService/managedClusters', parameters('drClusterName')), 'Microsoft.Authorization/roleAssignments', 'Owner')]",
"properties": {
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', parameters('drClusterName')), '2023-10-02-preview', 'full').identity.principalId]",
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')]"
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')]",
"principalType": "ServicePrincipal"
},
"dependsOn": [
"[resourceId('Microsoft.ContainerService/managedClusters', parameters('drClusterName'))]"
Expand Down
3 changes: 3 additions & 0 deletions azure_jumpstart_arcbox/bicep/clientVm/clientVm.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ resource vmRoleAssignment_KeyVaultAdministrator 'Microsoft.Authorization/roleAss
properties: {
principalId: vm.identity.principalId
roleDefinitionId: resourceId('Microsoft.Authorization/roleDefinitions', '00482a5a-887f-4fb3-b363-3b7fe8e74483')
principalType: 'ServicePrincipal'

}
}

Expand All @@ -249,6 +251,7 @@ resource vmRoleAssignment_Owner 'Microsoft.Authorization/roleAssignments@2022-04
properties: {
principalId: vm.identity.principalId
roleDefinitionId: resourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
principalType: 'ServicePrincipal'
}
}

Expand Down
2 changes: 2 additions & 0 deletions azure_jumpstart_arcbox/bicep/kubernetes/aks.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ resource aksRoleAssignment_Owner 'Microsoft.Authorization/roleAssignments@2022-0
properties: {
principalId: aksClusterName_resource.identity.principalId
roleDefinitionId: resourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
principalType: 'ServicePrincipal'
}
}

Expand All @@ -167,5 +168,6 @@ resource aksDRRoleAssignment_Owner 'Microsoft.Authorization/roleAssignments@2022
properties: {
principalId: drClusterName_resource.identity.principalId
roleDefinitionId: resourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
principalType: 'ServicePrincipal'
}
}
Loading