Skip to content

Commit cc15cb4

Browse files
Banani-RathBanani-Rath
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents b7ec073 + e8b6a2d commit cc15cb4

File tree

143 files changed

+2174
-918
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+2174
-918
lines changed

‎.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29498,6 +29498,11 @@
2949829498
"source_path_from_root": "/articles/cloud-shell/example-terraform-bash.md",
2949929499
"redirect_url": "/azure/developer/terraform/quickstart-configure",
2950029500
"redirect_document_id": false
29501+
},
29502+
{
29503+
"source_path_from_root": "/articles/aks/managed-cluster-snapshot.md",
29504+
"redirect_url": "/azure/aks/intro-kubernetes",
29505+
"redirect_document_id": "false"
2950129506
}
2950229507
]
2950329508
}

‎articles/active-directory/authentication/how-to-mfa-server-migration-utility.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: multi-factor-authentication
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: how-to
9-
ms.date: 11/11/2022
9+
ms.date: 11/14/2022
1010

1111
ms.author: justinha
1212
author: justinha
@@ -202,7 +202,7 @@ The settings option allows you to change the settings for the migration process:
202202
:::image type="content" border="true" source="./media/how-to-mfa-server-migration-utility/settings.png" alt-text="Screenshot of settings.":::
203203

204204
- Migrate – This setting allows you to specify which method(s) should be migrated for the selection of users
205-
- User Match – Allows you to specify a different attribute for matching users instead of the default UPN-matching
205+
- User Match – Allows you to specify a different on-premises Active Directory attribute for matching Azure AD UPN instead of the default match to userPrincipalName
206206
- Automatic synchronization – Starts a background service that will continually monitor any authentication method changes to users in the on-premises MFA Server, and write them to Azure AD at the specified time interval defined
207207

208208
The migration process can be an automatic process, or a manual process.

‎articles/aks/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,6 @@
186186
href: cluster-configuration.md
187187
- name: Custom node configuration
188188
href: custom-node-configuration.md
189-
- name: Use cluster snapshots (preview)
190-
href: managed-cluster-snapshot.md
191189
- name: Integrate ACR with an AKS cluster
192190
href: cluster-container-registry-integration.md
193191
- name: Use Vertical Pod Autoscaler (preview)

‎articles/aks/managed-cluster-snapshot.md

Lines changed: 0 additions & 172 deletions
This file was deleted.

‎articles/aks/use-network-policies.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ Azure Network Policy Manager(NPM) doesn't support IPv6. Otherwise, Azure NPM ful
5858
>[!NOTE]
5959
> * Azure NPM pod logs will record an error if an unsupported policy is created.
6060
61+
## Scale:
62+
63+
With the current limits set on Azure NPM for Linux, it can scale up to 500 Nodes and 40k Pods. You may see OOM kills beyond this scale. Please reach out to us on [aks-acn-github] if you'd like to increase your memory limit.
64+
6165
## Create an AKS cluster and enable Network Policy
6266

6367
To see network policies in action, let's create an AKS cluster that supports network policy and then work on adding policies.
@@ -323,6 +327,7 @@ To learn more about policies, see [Kubernetes network policies][kubernetes-netwo
323327
[calico-support]: https://www.tigera.io/tigera-products/calico/
324328
[calico-logs]: https://docs.projectcalico.org/maintenance/troubleshoot/component-logs
325329
[calico-aks-cleanup]: https://github.com/Azure/aks-engine/blob/master/docs/topics/calico-3.3.1-cleanup-after-upgrade.yaml
330+
[aks-acn-github]: https://github.com/Azure/azure-container-networking/issues
326331

327332
<!-- LINKS - internal -->
328333
[install-azure-cli]: /cli/azure/install-azure-cli

‎articles/api-management/protect-with-ddos-protection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Depending on the DDoS Protection plan you use, enable DDoS protection on the vir
5353

5454
### Enable DDoS protection on the API Management public IP address
5555

56-
If your plan uses the IP DDoS Protection SKU, see [Enable DDoS IP Protection for a public IP address](../ddos-protection/manage-ddos-protection-powershell-ip.md#disable-ddos-ip-protection-for-an-existing-public-ip-address).
56+
If your plan uses the IP DDoS Protection SKU, see [Enable DDoS IP Protection Preview for a public IP address](../ddos-protection/manage-ddos-protection-powershell-ip.md#disable-ddos-ip-protection-preview-for-an-existing-public-ip-address).
5757

5858
## Next steps
5959

‎articles/app-service/environment/overview.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ App Service Environment v3 is available in the following regions:
100100
| Region | Single zone support | Availability zone support | Single zone support |
101101
| -------------------- | :--------------------------: | :-------------------------: | :-------------------------: |
102102
| | App Service Environment v3 | App Service Environment v3 | App Service Environment v1/v2 |
103-
| Australia Central | ✅ | | ✅ |
104-
| Australia Central 2 | ✅* | | ✅ |
103+
| Australia Central | | | ✅ |
104+
| Australia Central 2 | | | ✅ |
105105
| Australia East | ✅ | ✅ | ✅ |
106106
| Australia Southeast | ✅ | | ✅ |
107107
| Brazil South | ✅ | ✅ | ✅ |
@@ -115,13 +115,13 @@ App Service Environment v3 is available in the following regions:
115115
| East US 2 | ✅ | ✅ | ✅ |
116116
| France Central | ✅ | ✅ | ✅ |
117117
| France South | | | ✅ |
118-
| Germany North | ✅ | | ✅ |
118+
| Germany North | | | ✅ |
119119
| Germany West Central | ✅ | ✅ | ✅ |
120120
| Japan East | ✅ | ✅ | ✅ |
121121
| Japan West | | | ✅ |
122122
| Jio India West | | | ✅ |
123123
| Korea Central | ✅ | ✅ | ✅ |
124-
| Korea South | ✅ | | ✅ |
124+
| Korea South | | | ✅ |
125125
| North Central US | ✅ | | ✅ |
126126
| North Europe | ✅ | ✅ | ✅ |
127127
| Norway East | ✅ | ✅ | ✅ |
@@ -130,7 +130,7 @@ App Service Environment v3 is available in the following regions:
130130
| South Africa North | ✅ | ✅ | ✅ |
131131
| South Africa West | | | ✅ |
132132
| South Central US | ✅ | ✅ | ✅ |
133-
| South India | ✅ | | ✅ |
133+
| South India | | | ✅ |
134134
| Southeast Asia | ✅ | ✅ | ✅ |
135135
| Sweden Central | ✅ | ✅ | |
136136
| Switzerland North | ✅ | ✅ | ✅ |
@@ -141,7 +141,7 @@ App Service Environment v3 is available in the following regions:
141141
| UK West | ✅ | | ✅ |
142142
| West Central US | ✅ | | ✅ |
143143
| West Europe | ✅ | ✅ | ✅ |
144-
| West India | ✅* | | ✅ |
144+
| West India | | | ✅ |
145145
| West US | ✅ | | ✅ |
146146
| West US 2 | ✅ | ✅ | ✅ |
147147
| West US 3 | ✅ | ✅ | ✅ |

0 commit comments

Comments
 (0)