Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/client-firewall-rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ To access Registry Endpoint and MAR discovery UI, the following FQDNs are requir
| - | - | - |
| Registry Endpoint and MAR discovery UI | https | `mcr.microsoft.com` |
| Data Endpoint | https | `*.data.mcr.microsoft.com` |
| Registry Endpoint for China Region | https | `mcr.azure.cn` |
| Data Endpoint for China Region | https | `*.data.mcr.azure.cn` |

> **Note:** The China region endpoints (`mcr.azure.cn`) and (`*.data.mcr.azure.cn`) are counterparts to (`mcr.microsoft.com`) and (`*.data.mcr.microsoft.com`).
Comment thread
terencet-dev marked this conversation as resolved.
Outdated


> **Note:** MAR provides global coverage through Azure Traffic Manager for the registry REST endpoint, with regional CDNs for the data endpoints.
> Over time, MAR regional endpoints _will change_ assuring the best performance for our customers. It is strongly recommended to avoid using region specific rules. The `*.data.mcr.microsoft.com` firewall rules will avoid disruption as we alter regions for performance & readability.
Expand Down
9 changes: 8 additions & 1 deletion docs/mcr-endpoints-guidance.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ To access Registry Endpoint and MAR discovery UI, the following FQDNs should be
| - | - | - |
| Registry Endpoint and MAR discovery UI | https | `mcr.microsoft.com` |
| Data Endpoint | https | `*.data.mcr.microsoft.com` |
| Registry Endpoint for China Region | https | `mcr.azure.cn` |
| Data Endpoint for China Region | https | `*.data.mcr.azure.cn` |

> **Note:** The China region endpoints (`mcr.azure.cn`) and (`*.data.mcr.azure.cn`) are counterparts to (`mcr.microsoft.com`) and (`*.data.mcr.microsoft.com`).

> **Note:** MAR provides global coverage through Azure Traffic Manager for the registry endpoint, with regional CDNs managed by Azure Front Door for the data endpoints.
> Over time, MAR team will continue adding regional endpoints to ensure the best performance for our customers. Check the [MAR Firewall Rules][mcr-firewall-rules] article for details how to configure your firewall rules.
Expand All @@ -36,12 +40,15 @@ MAR registry REST endpoints are available in the following nine locations:
- Asia South East
- Europe North
- Europe West
- North China
- East China
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- North China
- East China
- China North 3
- China East 3

See naming in below links:

- US Central
- US East
- US West
- US West 2
- US West-Central


Comment thread
terencet-dev marked this conversation as resolved.
Outdated
## MAR Data Endpoint Locations

MAR uses Azure Front Door CDN point of presence (POP) locations to provide reliable delivery of Microsoft content. Single CDN POP location can have multiple nodes serving the MAR content. To obtain the list of CDN POP locations for MAR use the following articles from Azure Front Door:
Expand All @@ -63,4 +70,4 @@ If you experience issues with pulling artifact from MAR, [contact Microsoft Supp
[azure-cdn-china]: https://docs.azure.cn/cdn/cdn-pops
[oci-spec]: https://github.com/opencontainers/distribution-spec
[oci-artifacts]: https://github.com/opencontainers/artifacts
[mcr-firewall-rules]: ../client-firewall-rules.md
[mcr-firewall-rules]: client-firewall-rules.md