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

fix: Update DCR creation to Clusters resource group instead of workspace (ARM Template update) #814

Closed
wants to merge 5 commits into from
Closed

fix: Update DCR creation to Clusters resource group instead of workspace (ARM Template update) #814

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95e1af9
fix: Update DCR creation to Clusters resource group instead of worksp…
bragi92 Sep 1, 2022
e58fdee
.
bragi92 Sep 8, 2022
1947508
.
bragi92 Sep 8, 2022
1ebc38b
.
bragi92 Sep 8, 2022
482bc1d
.
bragi92 Sep 8, 2022
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
16 changes: 4 additions & 12 deletions scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
"description": "Existing or new tags to use on AKS, ContainerInsights and DataCollectionRule Resources"
}
},
"workspaceLocation": {
"type": "string",
"metadata": {
"description": "Worksapce Location for data collection rule"
}
},
"workspaceResourceId": {
"type": "string",
"metadata": {
Expand All @@ -38,19 +32,17 @@
"clusterResourceGroup": "[split(parameters('aksResourceId'),'/')[4]]",
"clusterName": "[split(parameters('aksResourceId'),'/')[8]]",
"clusterLocation": "[replace(parameters('aksResourceLocation'),' ', '')]",
"workspaceSubscriptionId": "[split(parameters('workspaceResourceId'),'/')[2]]",
"workspaceResourceGroup": "[split(parameters('workspaceResourceId'),'/')[4]]",
"dcrName": "[Concat('MSCI', '-', variables('clusterName'), '-', variables('clusterLocation'))]",
"associationName": "ContainerInsightsExtension",
"dataCollectionRuleId": "[resourceId(variables('workspaceSubscriptionId'), variables('workspaceResourceGroup'), 'Microsoft.Insights/dataCollectionRules', variables('dcrName'))]"
"dataCollectionRuleId": "[resourceId(variables('clusterSubscriptionId'), variables('clusterResourceGroup'), 'Microsoft.Insights/dataCollectionRules', variables('dcrName'))]"
ganga1980 marked this conversation as resolved.
Show resolved Hide resolved
},
"resources": [
{
"type": "Microsoft.Resources/deployments",
"name": "[Concat('aks-monitoring-msi-dcr', '-', uniqueString(variables('dcrName')))]",
"apiVersion": "2017-05-10",
"subscriptionId": "[variables('workspaceSubscriptionId')]",
"resourceGroup": "[variables('workspaceResourceGroup')]",
"subscriptionId": "[variables('clusterSubscriptionId')]",
"resourceGroup": "[variables('clusterResourceGroup')]",
"properties": {
"mode": "Incremental",
"template": {
Expand All @@ -63,7 +55,7 @@
"type": "Microsoft.Insights/dataCollectionRules",
"apiVersion": "2021-04-01",
"name": "[variables('dcrName')]",
"location": "[parameters('workspaceLocation')]",
"location": "[parameters('clusterRegion')]",
bragi92 marked this conversation as resolved.
Show resolved Hide resolved
bragi92 marked this conversation as resolved.
Show resolved Hide resolved
"tags": "[parameters('resourceTagValues')]",
"kind": "Linux",
"properties": {
Expand Down
3 changes: 0 additions & 3 deletions scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
"workspaceResourceId": {
"value": "/subscriptions/<SubscriptionId>/resourceGroups/<ResourceGroup>/providers/Microsoft.OperationalInsights/workspaces/<workspaceName>"
},
"workspaceLocation": {
"value": "<workspaceLocation>"
},
"resourceTagValues": {
"value": {
"<existingOrnew-tag-name1>": "<existingOrnew-tag-value1>",
Expand Down
16 changes: 4 additions & 12 deletions scripts/onboarding/templates/arc-k8s-extension-msi-auth/existingClusterOnboarding.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
"description": "Azure Monitor Log Analytics Resource ID"
}
},
"workspaceRegion": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please note that, MSI auth support exists in k8s-extension of the azure-cli extensions so which needs to be updated as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will sync on this, with you.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

created draft PR with the change here -> AzureArcForKubernetes/azure-cli-extensions#175

"type": "string",
"metadata": {
"description": "Azure Monitor Log Analytics Workspace region e.g. \"eastus\""
}
},
"workspaceDomain": {
"type": "string",
"allowedValues": [
Expand All @@ -52,19 +46,17 @@
"clusterResourceGroup": "[split(parameters('clusterResourceId'),'/')[4]]",
"clusterName": "[split(parameters('clusterResourceId'),'/')[8]]",
"clusterLocation": "[replace(parameters('clusterRegion'),' ', '')]",
"workspaceSubscriptionId": "[split(parameters('workspaceResourceId'),'/')[2]]",
"workspaceResourceGroup": "[split(parameters('workspaceResourceId'),'/')[4]]",
"dcrName": "[Concat('MSCI', '-', variables('clusterName'), '-', variables('clusterLocation'))]",
"associationName": "ContainerInsightsExtension",
"dataCollectionRuleId": "[resourceId(variables('workspaceSubscriptionId'), variables('workspaceResourceGroup'), 'Microsoft.Insights/dataCollectionRules', variables('dcrName'))]"
"dataCollectionRuleId": "[resourceId(variables('clusterSubscriptionId'), variables('clusterResourceGroup'), 'Microsoft.Insights/dataCollectionRules', variables('dcrName'))]"
},
"resources": [
{
"type": "Microsoft.Resources/deployments",
"name": "[Concat('arc-k8s-monitoring-msi-dcr', '-', uniqueString(variables('dcrName')))]",
"apiVersion": "2017-05-10",
"subscriptionId": "[variables('workspaceSubscriptionId')]",
"resourceGroup": "[variables('workspaceResourceGroup')]",
"subscriptionId": "[variables('clusterSubscriptionId')]",
"resourceGroup": "[variables('clusterResourceGroup')]",
"properties": {
"mode": "Incremental",
"template": {
Expand All @@ -77,7 +69,7 @@
"type": "Microsoft.Insights/dataCollectionRules",
"apiVersion": "2021-04-01",
"name": "[variables('dcrName')]",
"location": "[parameters('workspaceRegion')]",
"location": "[parameters('clusterRegion')]",
"tags": "[parameters('resourceTagValues')]",
"kind": "Linux",
"properties": {
Expand Down
3 changes: 0 additions & 3 deletions scripts/onboarding/templates/arc-k8s-extension-msi-auth/existingClusterParam.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
"workspaceResourceId": {
"value": "/subscriptions/<subscriptionId>/resourcegroups/<resourceGroupName>/providers/microsoft.operationalinsights/workspaces/<workspaceName>"
},
"workspaceRegion": {
"value": "<workspaceRegion>"
},
"workspaceDomain": {
"value": "<workspaceDomainName>"
},
Expand Down