Skip to content

Commit 06ea5f8

Browse files
authored
Merge pull request #259905 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 5fbba66 + 8ff4a66 commit 06ea5f8

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

articles/aks/operator-best-practices-advanced-scheduler.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ spec:
160160
cpu: 4.0
161161
memory: 16Gi
162162
nodeSelector:
163-
hardware:
164-
values: highmem
163+
hardware: highmem
165164
```
166165

167166
When you use these scheduler options, work with your application developers and owners to allow them to correctly define their pod specifications.
@@ -247,4 +246,4 @@ This article focused on advanced Kubernetes scheduler features. For more informa
247246
[aks-best-practices-isolation]: operator-best-practices-cluster-isolation.md
248247
[use-multiple-node-pools]: create-node-pools.md
249248
[taint-node-pool]: manage-node-pools.md#specify-a-taint-label-or-tag-for-a-node-pool
250-
[use-gpus-aks]: gpu-cluster.md
249+
[use-gpus-aks]: gpu-cluster.md

articles/backup/azure-kubernetes-service-cluster-manage-backups.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ To enable Trusted Access between Backup vault and AKS cluster, use the following
130130

131131
```azurecli-interactive
132132
az aks trustedaccess rolebinding create \
133-
-g $myResourceGroup \ 
134-
--cluster-name $myAKSCluster 
135-
-n <randomRoleBindingName> \ 
136-
--source-resource-id <vaultID> \ 
133+
-g <aksclusterrg> \
134+
--cluster-name <aksclustername> \
135+
-n <randomRoleBindingName> \
136+
--source-resource-id $(az dataprotection backup-vault show -g <vaultrg> -v <VaultName> --query id -o tsv) \
137137
--roles Microsoft.DataProtection/backupVaults/backup-operator
138138
```
139139

articles/service-bus-messaging/compare-messaging-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ For more information, see [Service Bus overview](../service-bus-messaging/servic
7777
## Use the services together
7878
In some cases, you use the services side by side to fulfill distinct roles. For example, an e-commerce site can use Service Bus to process the order, Event Hubs to capture site telemetry, and Event Grid to respond to events like an item was shipped.
7979

80-
In other cases, you link them together to form an event and data pipeline. You use Event Grid to respond to events in the other services. For an example of using Event Grid with Event Hubs to migrate data to Azure Synapse Analytics, see [Stream big data into a Azure Synapse Analytics](../event-grid/event-hubs-integration.md). The following image shows the workflow for streaming the data.
80+
In other cases, you link them together to form an event and data pipeline. You use Event Grid to respond to events in the other services. For an example of using Event Grid with Event Hubs to migrate data to Azure Synapse Analytics, see [Stream big data into Azure Synapse Analytics](../event-grid/event-hubs-integration.md). The following image shows the workflow for streaming the data.
8181

8282
:::image type="content" source="./media/compare-messaging-services/overview.svg" alt-text="Diagram showing how Event Hubs, Service Bus, and Event Grid can be connected together.":::
8383

articles/site-recovery/site-recovery-runbook-automation.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ If you want to access all VMs in VMMap in a loop, you can use the following code
8181

8282

8383
```powershell
84+
param (
85+
[parameter(Mandatory=$false)]
86+
[Object]$RecoveryPlanContext
87+
)
8488
$VMinfo = $RecoveryPlanContext.VmMap | Get-Member | Where-Object MemberType -EQ NoteProperty | select -ExpandProperty Name
8589
$vmMap = $RecoveryPlanContext.VmMap
8690
foreach($VMID in $VMinfo)

articles/virtual-network/manage-network-security-group.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,9 @@ az network asg delete --resource-group myResourceGroup --name myASG
665665

666666
To manage network security groups, security rules, and application security groups, your account must be assigned to the [Network contributor](../role-based-access-control/built-in-roles.md?toc=%2fazure%2fvirtual-network%2ftoc.json#network-contributor) role. A [Custom role](../role-based-access-control/custom-roles.md?toc=%2fazure%2fvirtual-network%2ftoc.json) can also be used that's assigned the appropriate permissions as listed in the following tables:
667667

668+
> [!NOTE]
669+
> You might NOT see the full list of service tags if the Network Contributor role has been assigned at a Resource Group level. To view the full list, you can assign this role at a Subscription scope instead. If you can only allow Network Contributor for the Resource Group, you can then also create a custom role for the permissions "Microsoft.Network/locations/serviceTags/read" and "Microsoft.Network/locations/serviceTagDetails/read" and assign them at a Subscription scope along with the Network Contributor at Resource Group scope.
670+
668671
### Network security group
669672

670673
| Action | Name |

0 commit comments

Comments
 (0)