Skip to content

Commit 3d8c92d

Browse files
authored
Merge pull request #102002 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 7799146 + e4b37ce commit 3d8c92d

File tree

8 files changed

+13
-12
lines changed

8 files changed

+13
-12
lines changed

articles/aks/cluster-autoscaler.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ To adjust to changing application demands, such as between the workday and eveni
3737

3838
Both the horizontal pod autoscaler and cluster autoscaler can also decrease the number of pods and nodes as needed. The cluster autoscaler decreases the number of nodes when there has been unused capacity for a period of time. Pods on a node to be removed by the cluster autoscaler are safely scheduled elsewhere in the cluster. The cluster autoscaler may be unable to scale down if pods can't move, such as in the following situations:
3939

40-
* A pod directly created and isn't backed by a controller object, such a deployment or replica set.
40+
* A pod is directly created and isn't backed by a controller object, such as a deployment or replica set.
4141
* A pod disruption budget (PDB) is too restrictive and doesn't allow the number of pods to be fall below a certain threshold.
4242
* A pod uses node selectors or anti-affinity that can't be honored if scheduled on a different node.
4343

@@ -57,7 +57,7 @@ If you need to create an AKS cluster, use the [az aks create][az-aks-create] com
5757
> [!IMPORTANT]
5858
> The cluster autoscaler is a Kubernetes component. Although the AKS cluster uses a virtual machine scale set for the nodes, don't manually enable or edit settings for scale set autoscale in the Azure portal or using the Azure CLI. Let the Kubernetes cluster autoscaler manage the required scale settings. For more information, see [Can I modify the AKS resources in the node resource group?](faq.md#can-i-modify-tags-and-other-properties-of-the-aks-resources-in-the-node-resource-group)
5959
60-
The following example creates an AKS cluster with single node pool backed by a virtual machine scale set. It also enables the cluster autoscaler on the node pool for the cluster and sets a minimum of *1* and maximum of *3* nodes:
60+
The following example creates an AKS cluster with a single node pool backed by a virtual machine scale set. It also enables the cluster autoscaler on the node pool for the cluster and sets a minimum of *1* and maximum of *3* nodes:
6161

6262
```azurecli-interactive
6363
# First create a resource group
@@ -150,7 +150,7 @@ To learn more about what is logged from the autoscaler, read the FAQ on the [Kub
150150

151151
## Use the cluster autoscaler with multiple node pools enabled
152152

153-
The cluster autoscaler can be used together with the [multiple node pools](use-multiple-node-pools.md) enabled. Follow that document to learn how to enable multiple node pools and add additional node pools to an existing cluster. When using both features together, you enable the cluster autoscaler on each individual node pool in the cluster and can pass unique autoscaling rules to each.
153+
The cluster autoscaler can be used together with [multiple node pools](use-multiple-node-pools.md) enabled. Follow that document to learn how to enable multiple node pools and add additional node pools to an existing cluster. When using both features together, you enable the cluster autoscaler on each individual node pool in the cluster and can pass unique autoscaling rules to each.
154154

155155
The below command assumes you followed the [initial instructions](#create-an-aks-cluster-and-enable-the-cluster-autoscaler) earlier in this document and you want to update an existing node pool's max-count from *3* to *5*. Use the [az aks nodepool update][az-aks-nodepool-update] command to update an existing node pool's settings.
156156

articles/aks/virtual-nodes-portal.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This article shows you how to create and configure the virtual network resources
1717

1818
## Before you begin
1919

20-
Virtual nodes enable network communication between pods that run in ACI and the AKS cluster. To provide this communication, a virtual network subnet is created and delegated permissions are assigned. Virtual nodes only work with AKS clusters created using *advanced* networking. By default, AKS clusters are created with *basic* networking. This article shows you how to create a virtual network and subnets, then deploy an AKS cluster that uses advanced networking.
20+
Virtual nodes enable network communication between pods that run in Azure Container Instances (ACI) and the AKS cluster. To provide this communication, a virtual network subnet is created and delegated permissions are assigned. Virtual nodes only work with AKS clusters created using *advanced* networking. By default, AKS clusters are created with *basic* networking. This article shows you how to create a virtual network and subnets, then deploy an AKS cluster that uses advanced networking.
2121

2222
If you have not previously used ACI, register the service provider with your subscription. You can check the status of the ACI provider registration using the [az provider list][az-provider-list] command, as shown in the following example:
2323

@@ -241,4 +241,5 @@ Virtual nodes are one component of a scaling solution in AKS. For more informati
241241
[aks-hpa]: tutorial-kubernetes-scale.md
242242
[aks-cluster-autoscaler]: cluster-autoscaler.md
243243
[aks-basic-ingress]: ingress-basic.md
244-
[az-provider-list]: /cli/azure/provider#az-provider-list
244+
[az-provider-list]: /cli/azure/provider#az-provider-list
245+
[az-provider-register]: /cli/azure/provider?view=azure-cli-latest#az-provider-register

articles/application-gateway/configuration-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Network security groups (NSGs) are supported on Application Gateway. But there a
4949
- Outbound internet connectivity can't be blocked. Default outbound rules in the NSG allow internet connectivity. We recommend that you:
5050

5151
- Don't remove the default outbound rules.
52-
- Don't create other outbound rules that deny outbound internet connectivity.
52+
- Don't create other outbound rules that deny any outbound connectivity.
5353

5454
- Traffic from the **AzureLoadBalancer** tag must be allowed.
5555

articles/key-vault/about-keys-secrets-and-certificates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Where:
7272
|`keyvault-name`|The name for a key vault in the Microsoft Azure Key Vault service.<br /><br /> Key Vault names are selected by the user and are globally unique.<br /><br /> Key Vault name must be a 3-24 character string, containing only 0-9, a-z, A-Z, and -.|
7373
|`object-type`|The type of the object, either "keys" or "secrets".|
7474
|`object-name`|An `object-name` is a user provided name for and must be unique within a Key Vault. The name must be a 1-127 character string, containing only 0-9, a-z, A-Z, and -.|
75-
|`object-version`|An `object-version` is a system-generated, 32 character string identifier that is optionally used *o address a unique version of an object.|
75+
|`object-version`|An `object-version` is a system-generated, 32 character string identifier that is optionally used to address a unique version of an object.|
7676

7777
## Key Vault keys
7878

articles/postgresql/tutorial-design-database-hyperscale-realtime.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ In the preceding steps, you created Azure resources in a server group. If you do
226226

227227
## Next steps
228228

229-
In this tutorial, you learned how to provision a Hyperscale (Citus) server group. You connected to it with psql, created a schema, and distributed data. You learned to query data both in the raw form, regularly aggregate that data, query the aggregated tables, and expire old data.
229+
In this tutorial, you learned how to provision a Hyperscale (Citus) server group. You connected to it with psql, created a schema, and distributed data. You learned to query data in the raw form, regularly aggregate that data, query the aggregated tables, and expire old data.
230230

231231
Next, learn about the concepts of hyperscale.
232232
> [!div class="nextstepaction"]
233-
> [Hyperscale node types](https://aka.ms/hyperscale-concepts)
233+
> [Hyperscale node types](https://aka.ms/hyperscale-concepts)

articles/service-health/resource-health-checks-resource-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Below is a complete list of all the checks executed through resource health by r
134134
|---|
135135
|<ul><li>Is the VPN tunnel connected?</li><li>Are there configuration conflicts in the connection?</li><li>Are the pre-shared keys properly configured?</li><li>Is the VPN on-premises device reachable?</li><li>Are there mismatches in the IPSec/IKE security policy?</li><li>Is the S2S VPN connection properly provisioned or in a failed state?</li><li>Is the VNET-to-VNET connection properly provisioned or in a failed state?</li></ul>|
136136

137-
## Microsoft.network/expressreoutecircuits
137+
## Microsoft.network/expressroutecircuits
138138
|Executed Checks|
139139
|---|
140140
|<ul><li>Is the ExpressRoute circuit healthy?</li></ul>|

articles/stream-analytics/stream-analytics-parsing-json.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ The result is:
7272

7373

7474
### Access nested fields when property name is a variable
75-
Use the [GetRecordPropertyValue](https://docs.microsoft.com/stream-analytics-query/getmetadatapropertyvalue) function if the property name is a variable.
75+
Use the [GetRecordPropertyValue](https://docs.microsoft.com/stream-analytics-query/getrecordpropertyvalue-azure-stream-analytics) function if the property name is a variable.
7676

7777
For example, imagine a sample data stream needs to be joined with reference data containing thresholds for each device sensor. A snippet of such reference data is shown below.
7878

articles/virtual-machines/linux/tutorial-create-vmss.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Tutorial: Create a Windows virtual machine scale set"
2+
title: "Tutorial: Create a Linux virtual machine scale set"
33
description: Learn how to use the Azure CLI to create and deploy a highly available application on Linux VMs using a virtual machine scale set
44
services: virtual-machine-scale-sets
55
documentationcenter: ''

0 commit comments

Comments
 (0)