Skip to content

Commit 4952028

Browse files
authored
Merge pull request #16298 from sethmanheim/synclocalrebrand
Sync release-aks-hci-azurelocal-rebrand with release-azurelocal-rebrand
2 parents 1d2346a + 65a5fb2 commit 4952028

File tree

1,716 files changed

+10497
-9960
lines changed

Some content is hidden

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

1,716 files changed

+10497
-9960
lines changed

.openpublishing.publish.config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
".openpublishing.redirection.json",
142142
".openpublishing.redirection.pep.json",
143143
".openpublishing.redirection.aks.json",
144-
".openpublishing.redirection.aks-edge.json"
144+
".openpublishing.redirection.aks-edge.json",
145+
".openpublishing.redirection.azure-local.json"
145146
]
146147
}

.openpublishing.redirection.azure-local.json

Lines changed: 1644 additions & 0 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.json

Lines changed: 216 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,115 @@
11
{
22
"redirections": [
3+
{
4+
"source_path":"azure-stack/operator/compare-azure-azure-stack.md",
5+
"redirect_url":"/azure-stack/operator/azure-stack-overview",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path":"azure-stack/hci/guided-quick-deploy-eval.md",
10+
"redirect_url":"/azure-stack/hci/deploy/deployment-introduction",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path":"azure-stack/hci/whats-new-in-hci-22h2.md",
15+
"redirect_url":"/azure-stack/hci/whats-new?tabs=2408releases",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path":"azure-stack/hci/whats-new-in-hci-21h2.md",
20+
"redirect_url":"/azure-stack/hci/whats-new?tabs=2408releases",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path":"azure-stack/hci/known-issues-2310.md",
25+
"redirect_url":"/azure-stack/hci/known-issues-2311",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path":"azure-stack/hci/manage/whats-new-2306-preview.md",
30+
"redirect_url":"/azure-stack/hci/whats-new?tabs=2408releases",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path":"azure-stack/hci/manage/whats-new-2306-7-preview.md",
35+
"redirect_url":"/azure-stack/hci/whats-new?tabs=2408releases",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path":"azure-stack/hci/manage/whats-new-2306-5-preview.md",
40+
"redirect_url":"/azure-stack/hci/whats-new?tabs=2408releases",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path":"azure-stack/hci/manage/whats-new-2306-4-preview.md",
45+
"redirect_url":"/azure-stack/hci/whats-new?tabs=2408releases",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path":"azure-stack/hci/manage/whats-new-2306-3-preview.md",
50+
"redirect_url":"/azure-stack/hci/whats-new?tabs=2408releases",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path":"azure-stack/hci/manage/whats-new-2306-2-preview.md",
55+
"redirect_url":"/azure-stack/hci/whats-new?tabs=2408releases",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path":"azure-stack/hci/manage/whats-new-2306-1-preview.md",
60+
"redirect_url":"/azure-stack/hci/whats-new?tabs=2408releases",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path":"azure-stack/hci/hci-known-issues-2306-7.md",
65+
"redirect_url":"/azure-stack/hci/known-issues-2311-2",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path":"azure-stack/hci/hci-known-issues-2306-5.md",
70+
"redirect_url":"/azure-stack/hci/known-issues-2311-2",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path":"azure-stack/hci/hci-known-issues-2306-4.md",
75+
"redirect_url":"/azure-stack/hci/known-issues-2311-2",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path":"azure-stack/hci/hci-known-issues-2306-3.md",
80+
"redirect_url":"/azure-stack/hci/known-issues-2311-2",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path":"azure-stack/hci/hci-known-issues-2306-2.md",
85+
"redirect_url":"/azure-stack/hci/known-issues-2311-2",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path":"azure-stack/hci/hci-known-issues-2306-1.md",
90+
"redirect_url":"/azure-stack/hci/known-issues-2311-2",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path":"azure-stack/hci/hci-known-issues-2306.md",
95+
"redirect_url":"/azure-stack/hci/known-issues-2311-2",
96+
"redirect_document_id": false
97+
},
398
{
499
"source_path":"azure-stack/hci/deploy/tutorial-private-forest.md",
5100
"redirect_url":"/azure-stack/hci",
6101
"redirect_document_id": false
7102
},
103+
{
104+
"source_path":"azure-stack/hci/deploy/download-azure-stack-hci-23h2-software.md",
105+
"redirect_url":"/azure-stack/hci/deploy/download-23h2-software",
106+
"redirect_document_id": false
107+
},
108+
{
109+
"source_path":"azure-stack/hci/deploy/download-azure-stack-hci-software.md",
110+
"redirect_url":"/azure-stack/hci/deploy/download-software",
111+
"redirect_document_id": false
112+
},
8113
{
9114
"source_path":"azure-stack/hci/manage/bitlocker-on-csv.md",
10115
"redirect_url":"/azure-stack/hci/manage/manage-bitlocker",
@@ -1171,11 +1276,6 @@
11711276
"redirect_url": "/azure-stack/hci/manage/azure-arc-vm-management-overview",
11721277
"redirect_document_id": false
11731278
},
1174-
{
1175-
"source_path": "azure-stack/hci/concepts/azure-hybrid-benefit.md",
1176-
"redirect_url": "/azure-stack/hci/concepts/azure-hybrid-benefit-hci",
1177-
"redirect_document_id": false
1178-
},
11791279
{
11801280
"source_path": "azure-stack/hci/deploy/cluster-set.md",
11811281
"redirect_url": "/windows-server/failover-clustering/cluster-set",
@@ -1494,6 +1594,116 @@
14941594
"source_path": "azure-stack/hci/deploy/deployment-azure-arc-gateway-new-cluster.md",
14951595
"redirect_url": "/azure-stack/hci/deploy/deployment-azure-arc-gateway-overview",
14961596
"redirect_document_id": false
1597+
},
1598+
{
1599+
"source_path": "azure-stack/hci/azure-stack-hci-oem-license.md",
1600+
"redirect_url": "/azure-stack/hci/oem-license",
1601+
"redirect_document_id": false
1602+
},
1603+
{
1604+
"source_path": "azure-stack/hci/azure-stack-hci-license-billing.yml",
1605+
"redirect_url": "/azure-stack/hci/license-billing",
1606+
"redirect_document_id": false
1607+
},
1608+
{
1609+
"source_path": "azure-stack/hci/security-update/hci-security-update-oct-2024.md",
1610+
"redirect_url": "/azure-stack/hci/security-update/security-update-oct-2024",
1611+
"redirect_document_id": false
1612+
},
1613+
{
1614+
"source_path": "azure-stack/hci/security-update/hci-security-update-sep-2024.md",
1615+
"redirect_url": "/azure-stack/hci/security-update/security-update-sep-2024",
1616+
"redirect_document_id": false
1617+
},
1618+
{
1619+
"source_path": "azure-stack/hci/security-update/hci-security-update-aug-2024.md",
1620+
"redirect_url": "/azure-stack/hci/security-update/security-update-aug-2024",
1621+
"redirect_document_id": false
1622+
},
1623+
{
1624+
"source_path": "azure-stack/hci/security-update/hci-security-update-jul-2024.md",
1625+
"redirect_url": "/azure-stack/hci/security-update/security-update-jul-2024",
1626+
"redirect_document_id": false
1627+
},
1628+
{
1629+
"source_path": "azure-stack/hci/security-update/hci-security-update-jun-2024.md",
1630+
"redirect_url": "/azure-stack/hci/security-update/security-update-jun-2024",
1631+
"redirect_document_id": false
1632+
},
1633+
{
1634+
"source_path": "azure-stack/hci/security-update/hci-security-update-may-2024.md",
1635+
"redirect_url": "/azure-stack/hci/security-update/security-update-may-2024",
1636+
"redirect_document_id": false
1637+
},
1638+
{
1639+
"source_path": "azure-stack/hci/upgrade/troubleshoot-upgrade-to-azure-stack-hci-23h2.md",
1640+
"redirect_url": "/azure-stack/hci/upgrade/troubleshoot-upgrade-to-23h2",
1641+
"redirect_document_id": false
1642+
},
1643+
{
1644+
"source_path": "azure-stack/hci/migrate/migration-options-hci-overview.md",
1645+
"redirect_url": "/azure-stack/hci/migrate/migration-options-overview",
1646+
"redirect_document_id": false
1647+
},
1648+
{
1649+
"source_path": "azure-stack/hci/migrate/migration-azure-migrate-hci-overview.md",
1650+
"redirect_url": "/azure-stack/hci/migrate/migration-azure-migrate-overview",
1651+
"redirect_document_id": false
1652+
},
1653+
{
1654+
"source_path": "azure-stack/hci/manage/monitor-hci-single-23h2.md",
1655+
"redirect_url": "/azure-stack/hci/manage/monitor-single-23h2",
1656+
"redirect_document_id": false
1657+
},
1658+
{
1659+
"source_path": "azure-stack/hci/manage/monitor-hci-multi-23h2.md",
1660+
"redirect_url": "/azure-stack/hci/manage/monitor-multi-23h2",
1661+
"redirect_document_id": false
1662+
},
1663+
{
1664+
"source_path": "azure-stack/hci/manage/monitor-hci-multi-azure-policies.md",
1665+
"redirect_url": "/azure-stack/hci/manage/monitor-multi-azure-policies",
1666+
"redirect_document_id": false
1667+
},
1668+
{
1669+
"source_path": "azure-stack/hci/manage/setup-hci-system-alerts.md",
1670+
"redirect_url": "/azure-stack/hci/manage/setup-system-alerts",
1671+
"redirect_document_id": false
1672+
},
1673+
{
1674+
"source_path": "azure-stack/hci/concepts/azure-hybrid-benefit-hci.md",
1675+
"redirect_url": "/azure-stack/hci/concepts/azure-hybrid-benefit",
1676+
"redirect_document_id": false
1677+
},
1678+
{
1679+
"source_path": "azure-stack/hci/security-update/hci-security-update-nov-2023.md",
1680+
"redirect_url": "/azure-stack/hci/security-update/security-update-nov-2023",
1681+
"redirect_document_id": false
1682+
},
1683+
{
1684+
"source_path": "azure-stack/hci/security-update/hci-security-update-dec-2023.md",
1685+
"redirect_url": "/azure-stack/hci/security-update/security-update-dec-2023",
1686+
"redirect_document_id": false
1687+
},
1688+
{
1689+
"source_path": "azure-stack/hci/security-update/hci-security-update-jan-2024.md",
1690+
"redirect_url": "/azure-stack/hci/security-update/security-update-jan-2024",
1691+
"redirect_document_id": false
1692+
},
1693+
{
1694+
"source_path": "azure-stack/hci/security-update/hci-security-update-feb-2024.md",
1695+
"redirect_url": "/azure-stack/hci/security-update/security-update-feb-2024",
1696+
"redirect_document_id": false
1697+
},
1698+
{
1699+
"source_path": "azure-stack/hci/security-update/hci-security-update-mar-2024.md",
1700+
"redirect_url": "/azure-stack/hci/security-update/security-update-mar-2024",
1701+
"redirect_document_id": false
1702+
},
1703+
{
1704+
"source_path": "azure-stack/hci/security-update/hci-security-update-apr-2024.md",
1705+
"redirect_url": "/azure-stack/hci/security-update/security-update-apr-2024",
1706+
"redirect_document_id": false
14971707
}
14981708
]
1499-
}
1709+
}

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/breadcrumb/toc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
- name: Azure Stack
2-
tocHref: /azure-stack/
3-
topicHref: /azure-stack/index
1+
- name: Azure hybrid and multicloud documentation
2+
tocHref: /azure/adaptive-cloud/
3+
topicHref: /azure/adaptive-cloud/index
44
items:
55
- name: AKS enabled by Azure Arc
66
tocHref: /azure/aks/hybrid/

AKS-Hybrid/deploy-cluster-on-two-node-hci.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 01/09/2024
99

1010
# Availability scenarios for Azure Kubernetes Service (AKS) enabled by Azure Arc on two-node Azure Local
1111

12-
[!INCLUDE [applies-to](../azure-stack/includes/hci-applies-to-22h2.md)]
12+
[!INCLUDE [applies-to](../azure-local/includes/hci-applies-to-22h2.md)]
1313

1414
This article describes the architecture for deploying a Kubernetes cluster on a two-node Azure Local cluster. The article describes various failure scenarios that can occur, their impact on the cluster, and recoverability from these failure scenarios.
1515

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

0 commit comments

Comments
 (0)