Skip to content

Commit c84aeda

Browse files
authored
Merge pull request #16296 from sethmanheim/mc1111
Sync release-azurelocal-rebrand with main, fix merge
2 parents 9a7379d + dfffe71 commit c84aeda

12 files changed

+19
-35
lines changed

AKS-Hybrid/add-ons.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The following table shows examples of open-source and third-party integrations:
5454
|-------------------------|-----------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
5555
| [Helm](https://helm.sh/) | An open-source packaging tool that helps you install and manage the lifecycle of Kubernetes applications. | [Quickstart: Develop on Azure Kubernetes Service (AKS) with Helm](/azure/aks/quickstart-helm) |
5656
| [Istio](https://istio.io/) | An open-source service mesh. | [Istio installation guides](https://istio.io/latest/docs/setup/install/) |
57-
| [Linkerd](https://linkerd.io/) | An open-source service mesh. | [Linkerd getting started](https://linkerd.io/getting-started/) |
57+
| [Linkerd](https://linkerd.io/) | An open-source service mesh. | [Linkerd getting started](https://linkerd.io/2.16/getting-started/) |
5858

5959
## Next steps
6060

AKS-Hybrid/software-defined-networking.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ Next, you can [create workload clusters][] and [deploy your applications][]. All
177177
[Plan a Software Defined Network infrastructure]: /azure-stack/hci/concepts/plan-software-defined-networking-infrastructure
178178
[SDN Express]: /azure-stack/hci/manage/sdn-express
179179
[Windows Admin Center]: /azure-stack/hci/deploy/sdn-wizard
180-
[Software Load Balancer.psd1]: https://github.com/microsoft/SDN/blob/master/SDNExpress/scripts/Sample%20-%20Software%20Load%20Balancer.psd1
181180
[Troubleshooting SDN]: /windows-server/networking/sdn/troubleshoot/troubleshoot-software-defined-networking
182181
[how to create and attach VMs to an SDN virtual network]: /azure-stack/hci/manage/vm
183182
[New-AksHciNetworkSetting]: reference/ps/new-akshcinetworksetting.md

azure-local/concepts/network-atc-overview.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Network ATC overview
33
description: This article introduces Network ATC for Azure Local and Windows Server.
44
author: parammahajan5
55
ms.topic: overview
6-
ms.date: 10/28/2024
6+
ms.date: 11/06/2024
77
ms.author: jgerend
88
ms.reviewer: JasonGerend
99
zone_pivot_groups: windows-os
@@ -21,10 +21,7 @@ Deployment and operation of Azure Local networking can be a complex and error-pr
2121

2222
:::zone pivot="windows-server"
2323

24-
>Applies to: Windows Server 2025 (preview)
25-
26-
> [!IMPORTANT]
27-
> Network ATC in Windows Server 2025 is in PREVIEW. This information relates to a prerelease product that may be substantially modified before it's released. Microsoft makes no warranties, expressed or implied, with respect to the information provided here.
24+
>Applies to: Windows Server 2025
2825
2926
Deployment and operation of Windows Server cluster networking can be a complex and error-prone process. Due to the configuration flexibility provided with the host networking stack, there are many moving parts that can be easily misconfigured or overlooked. Staying up to date with the latest best practices is also a challenge as improvements are continuously made to the underlying technologies. Network ATC applies a consistency configuration across Windows Server cluster nodes to create a more reliable experience. As Network ATC is designed for Windows Server clusters, it requires Windows Server Datacenter edition and the Failover Clustering feature. Network ATC is the complete product name and not an acronym.
3027

azure-local/concepts/physical-network-requirements.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ If your switch isn't included, contact your switch vendor to ensure that your sw
135135

136136
|Model |Firmware| Management | Storage | Compute (Standard)| Compute (SDN)|
137137
|----- |---| :-: | :-: | :-: | :-: |
138-
| [S41xx series](https://www.dell.com/learn/us/en/45/shared-content~data-sheets~en/documents~dell-emc-networking-s4100-series-spec-sheet.pdf) <br>(10 GbE)|SmartFabric OS10.5.4 or later |&check;| &check;| &check;| &check; |
138+
| [S41xx series](https://www.dell.com/en-us/learn/assets/shared-content~data-sheets~en/documents~dell-emc-networking-s4100-series-spec-sheet.pdf) <br>(10 GbE)|SmartFabric OS10.5.4 or later |&check;| &check;| &check;| &check; |
139139
| [S52xx series](https://www.delltechnologies.com/resources/en-us/asset/data-sheets/products/networking/dell_emc_networking-s5200_on_spec_sheet.pdf) <br>(10, 25, 100 GbE)|SmartFabric OS10.5.4 or later |&check;| &check;| &check;| &check; |
140140
| [S54xx series](https://www.delltechnologies.com/asset/en-us/products/networking/technical-support/dell-emc-powerswitch-s5448f-on-spec-sheet.pdf) <br>(25, 100 GbE)|SmartFabric OS10.5.4 or later |&check;| &check;| &check;| &check; |
141141

@@ -145,7 +145,7 @@ If your switch isn't included, contact your switch vendor to ensure that your sw
145145

146146
|Model |Firmware| Management | Storage | Compute (Standard)| Compute (SDN)|
147147
|----- |---| :-: | :-: | :-: | :-: |
148-
| [S41xx series](https://www.dell.com/learn/us/en/45/shared-content~data-sheets~en/documents~dell-emc-networking-s4100-series-spec-sheet.pdf) <br>(10 GbE)|SmartFabric OS10.5.4 or later |&check;| &check;| &check;| &check; |
148+
| [S41xx series](https://www.dell.com/en-us/learn/assets/shared-content~data-sheets~en/documents~dell-emc-networking-s4100-series-spec-sheet.pdf) <br>(10 GbE)|SmartFabric OS10.5.4 or later |&check;| &check;| &check;| &check; |
149149
| [S52xx series](https://www.delltechnologies.com/resources/en-us/asset/data-sheets/products/networking/dell_emc_networking-s5200_on_spec_sheet.pdf) <br>(10, 25, 100 GbE)|SmartFabric OS10.5.4 or later |&check;| &check;| &check;| &check; |
150150
| [S54xx series](https://www.delltechnologies.com/asset/en-us/products/networking/technical-support/dell-emc-powerswitch-s5448f-on-spec-sheet.pdf) <br>(25, 100 GbE)|SmartFabric OS10.5.4 or later |&check;| &check;| &check;| &check; |
151151

azure-local/concepts/sdn-multisite-overview.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.topic: conceptual
66
author: alkohli
77
ms.subservice: core-os
88
zone_pivot_groups: windows-os
9-
ms.date: 10/25/2024
9+
ms.date: 11/06/2024
1010
---
1111

1212
# What is SDN Multisite?
@@ -17,10 +17,7 @@ ms.date: 10/25/2024
1717

1818
:::zone pivot="windows-server"
1919

20-
>Applies to: Windows Server 2025 (preview)
21-
22-
> [!IMPORTANT]
23-
> SDN Multisite in Windows Server 2025 is in PREVIEW. This information relates to a prerelease product that may be substantially modified before it's released. Microsoft makes no warranties, expressed or implied, with respect to the information provided here.
20+
>Applies to: Windows Server 2025
2421
2522
::: zone-end
2623

@@ -167,7 +164,7 @@ In SDN Multisite, if there's no VM migration between locations, data packets are
167164

168165
#### Load balancing in SDN Multisite with migrating workload VMs
169166

170-
If you decide to migrate one VM or all VMs behind the VIP to the other site, you might encounter situations where the VM you're trying to reach becomes unreachable over the VIP, depending on its location. This happens because load balancer resources are local to each Azure Local instance. As workload VMs move, the configurations on the MUXes arent global, leaving the other site unaware of migrations. The following animation illustrated the VMs migration from Cluster 2 to Cluster 1 and how the data packet's path fails after the migration.
167+
If you decide to migrate one VM or all VMs behind the VIP to the other site, you might encounter situations where the VM you're trying to reach becomes unreachable over the VIP, depending on its location. This happens because load balancer resources are local to each Azure Local instance. As workload VMs move, the configurations on the MUXes aren't global, leaving the other site unaware of migrations. The following animation illustrated the VMs migration from Cluster 2 to Cluster 1 and how the data packet's path fails after the migration.
171168

172169
:::image type="content" source="./media/sdn-multisite-overview/software-load-balancer-broken.gif" alt-text="Animation that shows load balancing in an SDN Multisite environment with migrating workloads." lightbox="./media/sdn-multisite-overview/software-load-balancer-broken.gif" :::
173170

azure-local/deploy/network-atc.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Deploy host networking with Network ATC
33
description: This topic covers how to deploy host networking for Azure Stack HCI and Windows Server.
44
author: dcuomo
55
ms.topic: how-to
6-
ms.date: 10/15/2024
6+
ms.date: 11/06/2024
77
ms.author: dacuo
88
ms.reviewer: jgerend
99
zone_pivot_groups: windows-os
@@ -19,10 +19,7 @@ This article guides you through the requirements, best practices, and deployment
1919

2020
:::zone pivot="windows-server"
2121

22-
>Applies to: Windows Server 2025 (preview)
23-
24-
> [!IMPORTANT]
25-
> Network ATC in Windows Server 2025 is in PREVIEW. This information relates to a prerelease product that may be substantially modified before it's released. Microsoft makes no warranties, expressed or implied, with respect to the information provided here.
22+
>Applies to: Windows Server 2025
2623
2724
This article guides you through the requirements, best practices, and deployment of Network ATC. Network ATC simplifies the deployment and network configuration management for Windows Server clusters. Network ATC provides an intent-based approach to host network deployment. By specifying one or more intents (management, compute, or storage) for a network adapter, you can automate the deployment of the intended configuration. For more information on Network ATC, including an overview and definitions, please see [Network ATC overview](../concepts/network-atc-overview.md).
2825

azure-local/manage/configure-network-security-groups-with-tags.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ ms.date: 11/08/2024
1616

1717
:::zone pivot="windows-server"
1818

19-
>Applies to: Windows Server 2025 (preview)
20-
> [!IMPORTANT]
21-
> Tag based network security groups in Windows Server 2025 is in PREVIEW. This information relates to a prerelease product that may be substantially modified before it's released. Microsoft makes no warranties, expressed or implied, with respect to the information provided here.
19+
>Applies to: Windows Server 2025
2220
2321
::: zone-end
2422

azure-local/manage/manage-default-network-access-policies-virtual-machines-23h2.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ ms.date: 11/08/2024
1616

1717
:::zone pivot="windows-server"
1818

19-
>Applies to: Windows Server 2025 (preview)
20-
> [!IMPORTANT]
21-
> Network access policies in Windows Server 2025 is in PREVIEW. This information relates to a prerelease product that may be substantially modified before it's released. Microsoft makes no warranties, expressed or implied, with respect to the information provided here.
19+
>Applies to: Windows Server 2025
2220
2321
::: zone-end
2422

azure-local/manage/manage-network-atc.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Manage Network ATC
33
description: This topic covers how to manage your Network ATC deployment.
44
author: jasongerend
55
ms.topic: how-to
6-
ms.date: 10/15/2024
6+
ms.date: 11/06/2024
77
ms.author: jgerend
88
zone_pivot_groups: windows-os
99
---
@@ -18,7 +18,7 @@ This article discusses how to manage Network ATC after it has been deployed. Net
1818

1919
:::zone pivot="windows-server"
2020

21-
>Applies to: Windows Server 2025 (preview)
21+
>Applies to: Windows Server 2025
2222
2323
This article discusses how to manage Network ATC after it has been deployed. Network ATC simplifies the deployment and network configuration management for Windows Server clusters. You use Windows PowerShell to manage Network ATC.
2424

azure-local/manage/manage-sdn-multisite.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: alkohli
66
ms.topic: how-to
77
ms.subservice: core-os
88
zone_pivot_groups: windows-os
9-
ms.date: 10/29/2024
9+
ms.date: 11/06/2024
1010
---
1111

1212
# Manage SDN Multisite for Azure Local and Windows Server
@@ -21,10 +21,7 @@ This article describes how to deploy and manage the Software Defined Networking
2121

2222
:::zone pivot="windows-server"
2323

24-
>Applies to: Windows Server 2025 (preview)
25-
26-
> [!IMPORTANT]
27-
> SDN Multisite in Windows Server 2025 is in PREVIEW. This information relates to a prerelease product that may be substantially modified before it's released. Microsoft makes no warranties, expressed or implied, with respect to the information provided here.
24+
>Applies to: Windows Server 2025
2825
2926
This article describes how to deploy and manage the Software Defined Networking (SDN) Multisite solution for Windows Server using Windows Admin Center.
3027

0 commit comments

Comments
 (0)