Skip to content

Commit ff67e38

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-stack-docs-pr into whatsnu
2 parents 4aa0bf4 + 0ae5f83 commit ff67e38

12 files changed

+44
-325
lines changed

.openpublishing.redirection.aks.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,6 +1405,16 @@
14051405
"redirect_url": "/azure/aks/hybrid/concepts-security",
14061406
"redirect_document_id": false
14071407
},
1408+
{
1409+
"source_path": "AKS-Hybrid/create-storage-classes.md",
1410+
"redirect_url": "/azure/aks/hybrid/overview",
1411+
"redirect_document_id": false
1412+
},
1413+
{
1414+
"source_path": "AKS-Hybrid/storage-class-overview.md",
1415+
"redirect_url": "/azure/aks/hybrid/overview",
1416+
"redirect_document_id": false
1417+
},
14081418
{
14091419
"source_path": "AKS-Hybrid/infrastructure-components.md",
14101420
"redirect_url": "/azure/aks/hybrid/cluster-architecture",

AKS-Hybrid/TOC.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,6 @@
8888
href: workload-identity.md
8989
- name: Storage
9090
items:
91-
- name: Storage Class and Container Storage Interface (CSI)
92-
items:
93-
- name: Overview
94-
href: storage-class-overview.md
95-
- name: Create storage classes
96-
href: create-storage-classes.md
9791
- name: CSI storage drivers
9892
items:
9993
- name: Use disk CSI drivers

AKS-Hybrid/create-storage-classes.md

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

AKS-Hybrid/storage-class-overview.md

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

azure-local/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ items:
110110
items:
111111
- name: Virtual deployment
112112
href: deploy/deployment-virtual.md
113-
- name: Jumpstart
113+
- name: Azure Local jumpstart
114114
href: https://arcjumpstart.com/azure_jumpstart_hcibox/getting_started
115115

116116
- name: Plan

azure-local/concepts/firewall-requirements.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This article provides guidance on how to configure firewalls for the Azure Stack
1515

1616
This article also describes how to optionally use a highly locked-down firewall configuration to block all traffic to all destinations except those included in your allowlist.
1717

18-
If your network uses a proxy server for internet access, see [Configure proxy settings for Azure Local](../manage/configure-proxy-settings.md).
18+
If your network uses a proxy server for internet access, see [Configure proxy settings for Azure Local](../manage/configure-proxy-settings-23h2.md).
1919

2020
> [!IMPORTANT]
2121
> Azure Express Route and Azure Private Link are not supported for Azure Local, version 23H2 or any of its components as it is not possible to access the public endpoints required for Azure Local, version 23H2.
@@ -182,3 +182,4 @@ This section shows how to configure Microsoft Defender firewall to allow IP addr
182182
For more information, see also:
183183
184184
- The Windows Firewall and WinRM 2.0 ports section of [Installation and configuration for Windows Remote Management](/windows/win32/winrm/installation-and-configuration-for-windows-remote-management#windows-firewall-and-winrm-20-ports)
185+
- See [About Azure Local, version 23H2 deployment](../deploy/deployment-introduction.md)

0 commit comments

Comments
 (0)