Skip to content

Commit a706621

Browse files
authored
Merge pull request #224063 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 596a947 + 72b72a0 commit a706621

File tree

5 files changed

+34
-15
lines changed

5 files changed

+34
-15
lines changed

articles/active-directory/hybrid/how-to-connect-modify-group-writeback.md

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,38 @@ If the original version of group writeback is already enabled and in use in your
3333
To configure directory settings to disable automatic writeback of newly created Microsoft 365 groups, use one of these methods:
3434

3535
- Azure portal: Update the `NewUnifiedGroupWritebackDefault` setting to `false`.
36-
- PowerShell: Use the [New-AzureADDirectorySetting](../enterprise-users/groups-settings-cmdlets.md) cmdlet. For example:
36+
- PowerShell: Use the [Microsoft Graph PowerShell SDK](/powershell/microsoftgraph/installation?view=graph-powershell-1.0&preserve-view=true). For example:
3737

3838
```PowerShell
39-
$TemplateId = (Get-AzureADDirectorySettingTemplate | where {$_.DisplayName -eq "Group.Unified" }).Id
40-
$Template = Get-AzureADDirectorySettingTemplate | where -Property Id -Value $TemplateId -EQ
41-
$Setting = $Template.CreateDirectorySetting()
42-
$Setting["NewUnifiedGroupWritebackDefault"] = "False"
43-
New-AzureADDirectorySetting -DirectorySetting $Setting
39+
# Import Module
40+
Import-Module Microsoft.Graph.Identity.DirectoryManagement
41+
42+
#Connect to MgGraph with necessary scope and select the Beta API Version
43+
Connect-MgGraph -Scopes Directory.ReadWrite.All
44+
Select-MgProfile -Name beta
45+
46+
# Import "Group.Unified" template values to a hashtable
47+
$Template = Get-MgDirectorySettingTemplate | Where-Object {$_.DisplayName -eq "Group.Unified"}
48+
$TemplateValues = @{}
49+
$Template.Values | ForEach-Object {
50+
$TemplateValues.Add($_.Name, $_.DefaultValue)
51+
}
52+
53+
# Update the value for new unified group writeback default
54+
$TemplateValues["NewUnifiedGroupWritebackDefault"] = "false"
55+
# Create a directory setting using the Template values hashtable including the updated value
56+
$params = @{}
57+
$params.Add("TemplateId", $Template.Id)
58+
$params.Add("Values", @())
59+
$TemplateValues.Keys | ForEach-Object {
60+
$params.Values += @(@{Name = $_; Value = $TemplateValues[$_]})
61+
}
62+
New-MgDirectorySetting -BodyParameter $params
4463
```
4564

65+
> [!NOTE]
66+
> We recommend using Microsoft Graph PowerShell SDK with [Windows PowerShell 7](/powershell/scripting/whats-new/migrating-from-windows-powershell-51-to-powershell-7?view=powershell-7.3&preserve-view=true).
67+
4668
- Microsoft Graph: Use the [directorySetting](/graph/api/resources/directorysetting?view=graph-rest-beta&preserve-view=true) resource type.
4769

4870
### Disable writeback for all existing Microsoft 365 group
@@ -56,7 +78,7 @@ To disable writeback of all Microsoft 365 groups that were created before these
5678
#Import-module
5779
Import-module Microsoft.Graph
5880
59-
#Connect to MgGraph and select the Beta API Version
81+
#Connect to MgGraph with necessary scope and select the Beta API Version
6082
Connect-MgGraph -Scopes Group.ReadWrite.All
6183
Select-MgProfile -Name beta
6284
@@ -68,8 +90,8 @@ To disable writeback of all Microsoft 365 groups that were created before these
6890
{
6991
Update-MgGroup -GroupId $group.id -WritebackConfiguration @{isEnabled=$false}
7092
}
71-
> We recomend using Microsoft Graph PowerShell SDK with [Windows PowerShell 7](/powershell/scripting/whats-new/migrating-from-windows-powershell-51-to-powershell-7?view=powershell-7.3&preserve-view=true)
72-
93+
```
94+
7395
- Microsoft Graph Explorer: Use a [group object](/graph/api/group-update?tabs=http&view=graph-rest-beta&preserve-view=true).
7496

7597
## Delete groups when they're disabled for writeback or soft deleted

articles/aks/azure-disk-volume.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ following command:
130130
pvc-azuredisk Bound pv-azuredisk 20Gi RWO 5s
131131
```
132132
133-
5. Create a *azure-disk-pod.yaml* file to reference your *PersistentVolumeClaim*. For example:
133+
5. Create an *azure-disk-pod.yaml* file to reference your *PersistentVolumeClaim*. For example:
134134
135135
```yaml
136136
apiVersion: v1

articles/aks/cluster-container-registry-integration.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ You can set up the AKS to ACR integration using the Azure CLI or Azure PowerShel
1717
> [!IMPORTANT]
1818
> There is a latency issue with Azure Active Directory groups when attaching ACR. If the AcrPull role is granted to an Azure AD group and the kubelet identity is added to the group to complete the RBAC configuration, there might be up to a one-hour delay before the RBAC group takes effect. We recommended you to use the [Bring your own kubelet identity][byo-kubelet-identity] as a workaround. You can pre-create a user-assigned identity, add it to the Azure AD group, then use the identity as the kubelet identity to create an AKS cluster. This ensures the identity is added to the Azure AD group before a token is generated by kubelet, which avoids the latency issue.
1919
20-
> [!IMPORTANT]
21-
> There is a latency issue with Azure Active Directory groups when attaching ACR. If the AcrPull role is granted to an Azure AD group and the kubelet identity is added to the group to complete the RBAC configuration, there might be up to a one-hour delay before the RBAC group update takes effect. We recommended you use the [Bring your own kubelet identity][byo-kubelet-identity] in the meantime. You can pre-create a user-assigned identity, add it to the Azure AD group, and then use the identity as the kubelet identity to create an AKS cluster. This ensures the identity is first added to the Azure AD group and then a token is generated by kubelet, which works around the latency issue.
22-
2320
> [!NOTE]
2421
> This article covers automatic authentication between AKS and ACR. If you need to pull an image from a private external registry, use an [image pull secret][image-pull-secret].
2522

articles/aks/workload-identity-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: mgoedtel
88

99
---
1010

11-
# Use an Azure AD workload identity (preview) on Azure Kubernetes Service (AKS)
11+
# Use Azure AD workload identity (preview) with Azure Kubernetes Service (AKS)
1212

1313
Today with Azure Kubernetes Service (AKS), you can assign [managed identities at the pod-level][use-azure-ad-pod-identity], which has been a preview feature. This pod-managed identity allows the hosted workload or application access to resources through Azure Active Directory (Azure AD). For example, a workload stores files in Azure Storage, and when it needs to access those files, the pod authenticates itself against the resource as an Azure managed identity. This authentication method has been replaced with [Azure Active Directory (Azure AD) workload identities][azure-ad-workload-identity] (preview), which integrate with the Kubernetes native capabilities to federate with any external identity providers. This approach is simpler to use and deploy, and overcomes several limitations in Azure AD pod-managed identity:
1414

articles/app-service/app-service-plan-manage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ You can create an empty App Service plan, or you can create a plan as part of ap
4242
You can move an app to another App Service plan, as long as the source plan and the target plan are in the _same resource group and geographical region_.
4343

4444
> [!NOTE]
45-
> Azure deploys each new App Service plan into a deployment unit, internally called a webspace. Each region can have many webspaces, but your app can only move between plans that are created in the same webspace. An App Service Environment is an isolated webspace, so apps can be moved between plans in the same App Service Environment, but not between plans in different App Service Environments.
45+
> Azure deploys each new App Service plan into a deployment unit, internally called a webspace. Each region can have many webspaces, but your app can only move between plans that are created in the same webspace. An App Service Environment can have multiple webspaces, but your app can only move between plans that are created in the same webspace.
4646
>
4747
> You can’t specify the webspace you want when creating a plan, but it’s possible to ensure that a plan is created in the same webspace as an existing plan. In brief, all plans created with the same resource group, region combination and operating system are deployed into the same webspace. For example, if you created a plan in resource group A and region B, then any plan you subsequently create in resource group A and region B is deployed into the same webspace. Note that plans can’t move webspaces after they’re created, so you can’t move a plan into “the same webspace” as another plan by moving it to another resource group.
4848
>

0 commit comments

Comments
 (0)