Skip to content

Commit c130f4a

Browse files
Merge pull request #3329 from MicrosoftDocs/main638628120002625595sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 0928259 + a7dbda4 commit c130f4a

39 files changed

+51
-62
lines changed

AKS-Hybrid/aks-create-clusters-cli.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to create Kubernetes clusters in Azure Stack HCI using Az
44
ms.topic: how-to
55
ms.custom: devx-track-azurecli
66
author: sethmanheim
7-
ms.date: 02/05/2024
7+
ms.date: 09/24/2024
88
ms.author: sethm
99
ms.lastreviewed: 01/25/2024
1010
ms.reviewer: guanghu
@@ -123,7 +123,7 @@ apiVersion: apps/v1
123123
"kubernetes.io/os": linux
124124
containers:
125125
- name: azure-vote-back
126-
image: mcr.microsoft.com/oss/bitnami/redis:6.0.8
126+
image: <path to image>/oss/bitnami/redis:6.0.8
127127
env:
128128
- name: ALLOW_EMPTY_PASSWORD
129129
value: "yes"
@@ -166,7 +166,7 @@ apiVersion: apps/v1
166166
"kubernetes.io/os": linux
167167
containers:
168168
- name: azure-vote-front
169-
image: mcr.microsoft.com/azuredocs/azure-vote-front:v1
169+
image: <path to image>/azure-vote-front:v1
170170
resources:
171171
requests:
172172
cpu: 100m

AKS-Hybrid/deploy-linux-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to deploy a multi-container Linux app to your Kubernetes
44
author: sethmanheim
55
ms.topic: how-to
66
ms.custom: linux-related-content
7-
ms.date: 06/27/2024
7+
ms.date: 09/24/2024
88
ms.author: sethm
99
ms.lastreviewed: 06/27/2022
1010
ms.reviewer: abha
@@ -103,7 +103,7 @@ spec:
103103
"beta.kubernetes.io/os": linux
104104
containers:
105105
- name: azure-vote-front
106-
image: mcr.microsoft.com/azuredocs/azure-vote-front:v1
106+
image: <path to image>/azure-vote-front:v1
107107
resources:
108108
requests:
109109
cpu: 100m

azure-stack/hci/concepts/data-collection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.date: 04/24/2023
1111

1212
# Azure Stack HCI data collection
1313

14-
[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2-21h2.md)]
14+
[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2.md)]
1515

1616
This topic describes required data collected to keep Azure Stack HCI secure, up to date, and working as expected.
1717

azure-stack/hci/concepts/nested-virtualization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.date: 04/17/2023
1111

1212
# Nested virtualization in Azure Stack HCI
1313

14-
[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2-21h2.md)]
14+
[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2.md)]
1515

1616
Nested virtualization is a feature that lets you run Hyper-V inside a Hyper-V virtual machine (VM). This allows you to maximize your hardware investments and gain flexibility in evaluation and testing scenarios.
1717

azure-stack/hci/concepts/network-atc-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.reviewer: JasonGerend
1010

1111
# Network ATC overview
1212

13-
[!INCLUDE [hci-applies-to-22h2-21h2](../../includes/hci-applies-to-22h2-21h2.md)]
13+
[!INCLUDE [hci-applies-to-22h2-21h2](../../includes/hci-applies-to-22h2.md)]
1414

1515
Deployment and operation of Azure Stack HCI 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. Additionally, configuration consistency across HCI cluster nodes is important as it leads to a more reliable experience.
1616

azure-stack/hci/concepts/network-hud-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.reviewer: dacuo
1010

1111
# Network HUD overview
1212

13-
[!INCLUDE [applies-to]( ../../includes/hci-applies-to-22h2-21h2.md)]
13+
[!INCLUDE [applies-to]( ../../includes/hci-applies-to-22h2.md)]
1414

1515
Network HUD enables visibility across the network, simplifying operational network diagnostics. It performs real-time analysis of network issues and provides prescriptive alerts or auto-remediation of the issue when possible. These capabilities can increase stability and optimize network performance for workloads running on Azure Stack HCI.
1616

azure-stack/hci/concepts/single-server-clusters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.date: 04/01/2024
1111

1212
# Using Azure Stack HCI on a single server
1313

14-
[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2-21h2.md)]
14+
[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2.md)]
1515

1616
[!INCLUDE [warning-23h2](../../includes/hci-warning-single-server-22h2.md)]
1717

azure-stack/hci/concepts/stretched-clusters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.reviewer: johnmar
1010

1111
# Stretched clusters overview
1212

13-
[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2-21h2.md)]
13+
[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2.md)]
1414

1515
> [!IMPORTANT]
1616
> Stretched clusters are not yet supported in Azure Stack HCI version 23H2.

azure-stack/hci/concepts/system-requirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.date: 05/22/2024
1212

1313
# System requirements for Azure Stack HCI, version 22H2
1414

15-
[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2-21h2.md)]
15+
[!INCLUDE [applies-to](../../includes/hci-applies-to-22h2.md)]
1616

1717
> [!WARNING]
1818
> The system requirements listed in this article apply to an older version, Azure Stack HCI, version 22H2. To find the system requirements for the latest generally available version, Azure Stack HCI, version 23H2, see [System requirements for Azure Stack HCI, version 23H2](./system-requirements-23h2.md).

azure-stack/hci/concepts/updates.md

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

1010
# Updates and upgrades
1111

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

1414
This article describes the lifecycle of updates and upgrades on Azure Stack HCI.
1515

0 commit comments

Comments
 (0)