Skip to content

Commit 370bd59

Browse files
authored
Merge pull request #109405 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 8305051 + 68154f3 commit 370bd59

File tree

6 files changed

+17
-5
lines changed

6 files changed

+17
-5
lines changed

articles/active-directory/saas-apps/netskope-cloud-security-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
8080
1. On the **Basic SAML Configuration** section, if you wish to configure the application in **IDP** initiated mode, enter the values for the following fields:
8181

8282
a. In the **Identifier** text box, type a URL using the following pattern:
83-
`Netskope_<OrgKey>`
83+
`<OrgKey>`
8484

8585
b. In the **Reply URL** text box, type a URL using the following pattern:
8686
`https://<tenant_host_name>/saml/acs`
@@ -231,4 +231,4 @@ When you click the Netskope Administrator Console tile in the Access Panel, you
231231

232232
- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
233233

234-
- [Try Netskope Administrator Console with Azure AD](https://aad.portal.azure.com/)
234+
- [Try Netskope Administrator Console with Azure AD](https://aad.portal.azure.com/)
186 KB
Loading

articles/aks/private-clusters.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,18 @@ As mentioned, VNet peering is one way to access your private cluster. To use VNe
7777
8. Select **Add**, add the virtual network of the VM, and then create the peering.
7878
9. Go to the virtual network where you have the VM, select **Peerings**, select the AKS virtual network, and then create the peering. If the address ranges on the AKS virtual network and the VM's virtual network clash, peering fails. For more information, see [Virtual network peering][virtual-network-peering].
7979

80+
## Hub and spoke with custom DNS
81+
82+
[Hub and spoke architectures](https://docs.microsoft.com/azure/architecture/reference-architectures/hybrid-networking/hub-spoke) are commonly used to deploy networks in Azure. In many of these deployments, DNS settings in the spoke VNets are configured to reference a central DNS forwarder to allow for on-premises and Azure-based DNS resolution. When deploying an AKS cluster into such a networking environment, there are some special considerations that must be taken into account.
83+
84+
![Private cluster hub and spoke](media/private-clusters/aks-private-hub-spoke.png)
85+
86+
1. By default, when a private cluster is provisioned, a private endpoint (1) and a private DNS zone (2) are created in the cluster managed resource group. The cluster uses an A record in the private zone to resolve the IP of the private endpoint for communication to the API server.
87+
88+
2. The private DNS zone is linked only to the VNet that the cluster nodes are attached to (3). This means that the private endpoint can only be resolved by hosts in that linked VNet. In scenarios where no custom DNS is configured on the VNet (default), this works without issue as hosts point at 168.63.129.16 for DNS which can resolve records in the private DNS zone due to the link.
89+
90+
3. In scenarios where the VNet containing your cluster has custom DNS settings (4), cluster deployment fails unless the private DNS zone is linked to the VNet that contains the custom DNS resolvers (5). This link can be created manually after the private zone is created during cluster provisioning or via automation upon detection of creation of the zone using Azure Policy or other event-based deployment mechanisms (for example, Azure Event Grid and Azure Functions).
91+
8092
## Dependencies
8193

8294
* The Private Link service is supported on Standard Azure Load Balancer only. Basic Azure Load Balancer isn't supported.

articles/azure-resource-manager/custom-providers/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.author: jobreen
99

1010
# Azure Custom Resource Providers Overview
1111

12-
Azure Custom Resource Providers is an extensibility platform to Azure. It allows you define to custom APIs that can be used to enrich the default Azure experience. This documentation describes:
12+
Azure Custom Resource Providers is an extensibility platform to Azure. It allows you to define custom APIs that can be used to enrich the default Azure experience. This documentation describes:
1313

1414
- How to build and deploy an Azure Custom Resource Provider.
1515
- How to utilize Azure Custom Resource Providers to extend existing workflows.

articles/cognitive-services/form-recognizer/quickstarts/label-tool.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You'll use the Docker engine to run the sample labeling tool. Follow these steps
4646
Install Docker on your machine by following the appropriate instructions for your operating system:
4747
* [Windows](https://docs.docker.com/docker-for-windows/)
4848
* [macOS](https://docs.docker.com/docker-for-mac/)
49-
* [Linux](https://docs.docker.com/install/).
49+
* [Linux](https://docs.docker.com/install/)
5050

5151
1. Get the sample labeling tool container with the `docker pull` command.
5252
```

articles/storage/common/storage-use-emulator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,6 @@ There are no differences specific to Queue storage in the emulator.
321321

322322
## Next steps
323323

324-
* Evaluate the cross-platform, community-maintained open-source storage emulator [Azurite](https://github.com/arafato/azurite).
324+
* Evaluate the cross-platform, community-maintained open-source storage emulator [Azurite](https://github.com/azure/azurite).
325325
* [Azure Storage samples using .NET](../storage-samples-dotnet.md) contains links to several code samples you can use when developing your application.
326326
* You can use the [Microsoft Azure Storage Explorer](https://storageexplorer.com) to work with resources in your cloud Storage account, and in the storage emulator.

0 commit comments

Comments
 (0)