Skip to content

Commit be51de0

Browse files
authored
Merge pull request #217496 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 7c80fb4 + 6ec7254 commit be51de0

File tree

6 files changed

+16
-8
lines changed

6 files changed

+16
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Let's assume:
9898

9999
Again, let's assume:
100100
1. You have a two-node cluster: *node1* and *node2*.
101-
1. You upgrade then node pool.
101+
1. You upgrade the node pool.
102102
1. An additional node is created: *node3*.
103103
1. The taints from *node1* are applied to *node3*.
104104
1. *node1* is deleted.
@@ -122,7 +122,7 @@ Alternatively, you can use node selectors. For example, you label nodes to indic
122122

123123
Unlike tolerations, pods without a matching node selector can still be scheduled on labeled nodes. This behavior allows unused resources on the nodes to consume, but prioritizes pods that define the matching node selector.
124124

125-
Let's look at an example of nodes with a high amount of memory. These nodes prioritize pods that request a high amount of memory. To ensure the resources don't sit idle, they also allow other pods to run. The follow example command adds a node pool with the label *hardware=highmem* to the *myAKSCluster* in the *myResourceGroup*. All nodes in that node pool will have this label.
125+
Let's look at an example of nodes with a high amount of memory. These nodes prioritize pods that request a high amount of memory. To ensure the resources don't sit idle, they also allow other pods to run. The following example command adds a node pool with the label *hardware=highmem* to the *myAKSCluster* in the *myResourceGroup*. All nodes in that node pool will have this label.
126126

127127
```azurecli-interactive
128128
az aks nodepool add \

articles/aks/use-group-managed-service-accounts.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ Enabling GMSA with Windows Server nodes on AKS requires:
2222
* Permissions to configure GMSA on Active Directory Domain Service or on-prem Active Directory.
2323
* The domain controller must have Active Directory Web Services enabled and must be reachable on port 9389 by the AKS cluster.
2424

25+
> [!NOTE]
26+
> Microsoft also provides a purpose-built PowerShell module to configure gMSA on AKS. You can find more information on the module and how to use it in the article [gMSA on Azure Kubernetes Service](/virtualization/windowscontainers/manage-containers/gmsa-aks-ps-module).
27+
2528
## Configure GMSA on Active Directory domain controller
2629

2730
To use GMSA with AKS, you need both GMSA and a standard domain user credential to access the GMSA credential configured on your domain controller. To configure GMSA on your domain controller, see [Getting Started with Group Managed Service Accounts][gmsa-getting-started]. For the standard domain user credential, you can use an existing user or create a new one, as long as it has access to the GMSA credential.
@@ -337,7 +340,10 @@ To verify GMSA is working and configured correctly, open a web browser to the ex
337340

338341
### No authentication is prompted when loading the page
339342

340-
If the page loads, but you are not prompted to authenticate, use `kubelet logs POD_NAME` to display the logs of your pod and verify you see *IIS with authentication is ready*.
343+
If the page loads, but you are not prompted to authenticate, use `kubectl logs POD_NAME` to display the logs of your pod and verify you see *IIS with authentication is ready*.
344+
345+
> [!NOTE]
346+
> Windows containers won't show logs on kubectl by default. To enable Windows containers to show logs, you need to embed the Log Monitor tool on your Windows image. More information is available [here](https://github.com/microsoft/windows-container-tools).
341347

342348
### Connection timeout when trying to load the page
343349

articles/aks/use-windows-hpc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ NAME READY STATUS RESTARTS AGE
111111
privileged-daemonset-12345 1/1 Running 0 2m13s
112112
```
113113

114-
Use `kubctl log` to view the logs of the pod and verify the pod has administrator rights:
114+
Use `kubectl log` to view the logs of the pod and verify the pod has administrator rights:
115115

116116
```output
117117
$ kubectl logs privileged-daemonset-12345 --namespace kube-system

articles/azure-cache-for-redis/cache-how-to-upgrade.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@ Set-AzRedisCache -Name "CacheName" -ResourceGroupName "ResourceGroupName" -Redis
7575

7676
## Next steps
7777

78-
- To learn more about Azure Cache for Redis versions, see lin[Set Redis version for Azure Cache for Redis](cache-how-to-version.md)
78+
- To learn more about Azure Cache for Redis versions, see [Set Redis version for Azure Cache for Redis](cache-how-to-version.md)
7979
- To learn more about Redis 6 features, see [Diving Into Redis 6.0 by Redis](https://redis.com/blog/diving-into-redis-6/)
80-
- To learn more about Azure Cache for Redis features: [Azure Cache for Redis Premium service tiers](cache-overview.md#service-tiers)
80+
- To learn more about Azure Cache for Redis features: [Azure Cache for Redis Premium service tiers](cache-overview.md#service-tiers)

articles/cost-management-billing/microsoft-customer-agreement/manage-tenants.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ The article helps you understand and manage tenants associated with your Microso
1919

2020
A tenant is a digital representation of your organization and is primarily associated with a domain, like Microsoft.com. It's an environment managed through Azure Active Directory that enables you to assign users permissions to manage Azure resources and billing.
2121

22-
Each tenant is distinct and separate from other tenants, yet you can allow guest users from other tenants to access your tenant to track your costs and manage billing.
22+
Each tenant is distinct and separate from other tenants. You can allow users from other tenants to access your billing account by using one of the following methods:
23+
- Creating guest users in your tenants and assigning the appropriate billing role.
24+
- Associating the other tenant to your tenant and assigning the appropriate billing role.
2325

2426
## What's an associated tenant?
2527
An associated tenant is a tenant that is linked to your primary billing tenant’s billing account. You can move Microsoft 365 subscriptions to these tenants. You can also assign billing account roles to users in associated billing tenants. Read more about associated tenants [Manage billing across multiple tenants using associated billing tenants](../manage/manage-billing-across-tenants.md).

articles/storage/blobs/anonymous-read-access-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ To allow or disallow public access for a storage account with a template, create
174174
>
175175
> After you update the public access setting for the storage account, it may take up to 30 seconds before the change is fully propagated.
176176

177-
When a container is configured for anonymous public access, requests to read blobs in that container do not need to be authorized. However, any firewall rules that are configured for the storage account remain in effect and will block anonymous traffic.
177+
When a container is configured for anonymous public access, requests to read blobs in that container do not need to be authorized. However, any firewall rules that are configured for the storage account remain in effect and will block traffic inline with the configured ACLs.
178178

179179
Allowing or disallowing blob public access requires version 2019-04-01 or later of the Azure Storage resource provider. For more information, see [Azure Storage Resource Provider REST API](/rest/api/storagerp/).
180180

0 commit comments

Comments
 (0)