Skip to content

Commit ae96fdd

Browse files
learn-build-service-prod[bot]learn-build-service-prod[bot]
authored
Merge pull request #3301 from MicrosoftDocs/main638611701347362227sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 9ba8468 + 97fedec commit ae96fdd

23 files changed

+369
-229
lines changed

‎AKS-Hybrid/aks-arc-diagnostic-checker.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ param (
9797
$urlArray = @(
9898
"https://management.azure.com",
9999
"https://eastus.dp.kubernetesconfiguration.azure.com",
100-
"https://log in.microsoftonline.com",
100+
"https://login.microsoftonline.com",
101101
"https://eastus.log in.microsoft.com",
102-
"https://log in.windows.net",
102+
"https://login.windows.net",
103103
"https://mcr.microsoft.com",
104104
"https://gbl.his.arc.azure.com",
105105
"https://k8connecthelm.azureedge.net",

‎AKS-Hybrid/aks-edge-howto-multi-node-deployment.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ You can generate the parameters needed to create a scalable cluster using the fo
2727
New-AksEdgeConfig -DeploymentType ScalableCluster -outFile .\aksedge-config.json | Out-Null
2828
```
2929

30-
This creates a configuration file called **aksedge-config.json** which includes the configuration needed to create a scalable cluster with a Linux node. The file is created in your current working directory. See the following examples for more options for creating the configuration file. A detailed description of the configuration parameters [is available here](aks-edge-deployment-config-json.md).
30+
This command creates a configuration file named **aksedge-config.json**, which includes the configuration needed to create a scalable cluster with a Linux node. The file is created in your current working directory. See [Deployment JSON configuration](aks-edge-deployment-config-json.md) for detailed descriptions of the configuration parameters (such as proxy settings).
31+
32+
See the following examples for more options for creating the configuration file.
3133

3234
The key parameters to note for a scalable Kubernetes deployment are:
3335

‎AKS-Hybrid/aks-edge-howto-single-node-deployment.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ New-AksEdgeConfig -DeploymentType SingleMachineCluster -outFile .\aksedge-config
2626

2727
This command creates a configuration file called **aksedge-config.json** that includes the configuration needed to create a single-machine cluster with a Linux node. The file is created in your current working directory. See the following examples for more options for creating the configuration file.
2828

29-
A detailed description of the configuration parameters [is available here](aks-edge-deployment-config-json.md).
29+
See [Deployment JSON configuration](aks-edge-deployment-config-json.md) for a detailed description of the configuration parameters.
3030

3131
The key parameters for single machine deployment are:
3232

@@ -90,6 +90,9 @@ $machine.LinuxNode.MemoryInMB = 4096
9090
New-AksEdgeDeployment -JsonConfigString ($jsonObj | ConvertTo-Json -Depth 4)
9191
```
9292

93+
> [!TIP]
94+
> See [Deployment JSON configuration](aks-edge-deployment-config-json.md) for all available options, including network settings such as proxy settings.
95+
9396
### Create a simple cluster with NodePort service
9497

9598
You can create a simple cluster with no service IPs (`ServiceIPRangeSize` set as 0):

‎AKS-Hybrid/aks-edge-quickstart.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ ms.custom: template-how-to
1212

1313
This quickstart describes how to set up an Azure Kubernetes Service (AKS) Edge Essentials single-machine K3S Linux-only cluster.
1414

15+
> [!NOTE]
16+
> The purpose of this quickstart script is to ease the evaluation process. This script requires higher level credentials for a one-time setup of the Azure subscription. This is not intended for production use.
17+
1518
## Prerequisites
1619

1720
- See the [system requirements](aks-edge-system-requirements.md). For this quickstart, ensure that you have a minimum of 4.5 GB RAM free, 4 vCPUs and 20 GB free disk space.
@@ -53,6 +56,9 @@ This script automates the following steps:
5356
- Installs the Azure Connected Machine Agent and connects the host machine to Arc for Servers.
5457
- Connects the deployed cluster to Arc for connected Kubernetes.
5558

59+
> [!TIP]
60+
> You can modify the `$aksedgeConfig` json content in the `AksEdgeQuickStart` script for any additional options. For available options, see [Deployment JSON configuration](aks-edge-deployment-config-json.md).
61+
5662
## Step 2: Deploy AKS Edge Essentials
5763

5864
In an elevated PowerShell prompt, run the `AksEdgeQuickStart.ps1` script. This brings up a K3s cluster:

‎AKS-Hybrid/container-storage-interface-files.md

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Use Container Storage Interface (CSI) file drivers in AKS enabled by Azur
33
description: Learn how to use Container Storage Interface (CSI) drivers to manage files in AKS Arc.
44
author: sethmanheim
55
ms.topic: how-to
6-
ms.date: 01/12/2024
6+
ms.date: 08/20/2024
77
ms.author: sethm
88
ms.lastreviewed: 01/14/2022
99
ms.reviewer: abha
@@ -33,46 +33,46 @@ If multiple nodes need concurrent access to the same storage volumes in AKS Arc,
3333

3434
1. Make sure the SMB driver is deployed. The SMB CSI driver is installed by default when you create a Kubernetes cluster using the Azure portal or the `az aksarc create` command. If you create a Kubernetes cluster by using `--disable-smb-driver`, you must enable the SMB driver on this cluster using the `az aksarc update` command:
3535

36-
```azurecli
37-
az aksarc update -n $aksclustername -g $resource_group --enable-smb-driver
38-
```
36+
```azurecli
37+
az aksarc update -n $aksclustername -g $resource_group --enable-smb-driver
38+
```
3939

4040
### [AKS on Azure Stack HCI 22H2 and Windows Server](#tab/22H2)
4141

4242
1. Make sure the SMB driver is deployed. Deploy the driver using the following [Install-AksHciCsiSmb](./reference/ps/install-akshcicsismb.md) PowerShell command:
4343

44-
```powershell
45-
Install-AksHciCsiSmb -clusterName mycluster
46-
```
44+
```powershell
45+
Install-AksHciCsiSmb -clusterName mycluster
46+
```
4747

4848
---
4949

50-
2. Create Kubernetes secrets to store the credentials required to access SMB shares by running the following command:
50+
1. Create Kubernetes secrets to store the credentials required to access SMB shares by running the following command:
5151

5252
```console
5353
kubectl create secret generic smbcreds --from-literal username=$username --from-literal password=$password --from-literal domain=$domain
5454
```
5555

56-
3. Create a storage class using `kubectl` to create a new SMB storage class with the following manifest:
57-
58-
```yaml
59-
apiVersion: storage.k8s.io/v1
60-
kind: StorageClass
61-
metadata:
62-
name: smb-csi
63-
provisioner: smb.csi.akshci.com
64-
parameters:
65-
source: \\smb-server\share
66-
csi.storage.k8s.io/node-stage-secret-name: "smbcreds"
67-
csi.storage.k8s.io/node-stage-secret-namespace: "default"
68-
reclaimPolicy: Retain # only Retain is supported
69-
volumeBindingMode: Immediate
70-
mountOptions:
71-
- dir_mode=0777
72-
- file_mode=0777
73-
- uid=1001
74-
- gid=1001
75-
```
56+
1. Create a storage class using `kubectl` to create a new SMB storage class with the following manifest:
57+
58+
```yaml
59+
apiVersion: storage.k8s.io/v1
60+
kind: StorageClass
61+
metadata:
62+
name: smb-csi
63+
provisioner: smb.csi.akshci.com
64+
parameters:
65+
source: \\smb-server\share
66+
csi.storage.k8s.io/node-stage-secret-name: "smbcreds"
67+
csi.storage.k8s.io/node-stage-secret-namespace: "default"
68+
reclaimPolicy: Retain # only Retain is supported
69+
volumeBindingMode: Immediate
70+
mountOptions:
71+
- dir_mode=0777
72+
- file_mode=0777
73+
- uid=1001
74+
- gid=1001
75+
```
7676
7777
### Use NFS drivers
7878
@@ -94,7 +94,7 @@ If multiple nodes need concurrent access to the same storage volumes in AKS Arc,
9494

9595
---
9696

97-
2. Create an NFS storage class using the following manifest:
97+
1. Create an NFS storage class using the following manifest:
9898

9999
```yaml
100100
apiVersion: storage.k8s.io/v1

‎AKS-Hybrid/scale-requirements.md

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,31 @@ This article describes the maximum and minimum supported scale count for AKS on
1818

1919
## Support count for AKS on HCI
2020

21-
| Scale item | Count |
22-
|--------------------------------------------------------------------------|--------------------------------------------|
23-
| Minimum number of physical nodes in an Azure Stack HCI cluster | 1 |
24-
| Maximum number of physical nodes in an Azure Stack HCI cluster | 16 |
25-
| Minimum count for control plane node | 1 |
26-
| Maximum count for control plane node | 5 <br /> Allowed values: 1, 3, and 5. |
27-
| Minimum number of nodes in default node pool created during cluster create | 1 |
28-
| Minimum number of node pools in an AKS cluster | 1 |
29-
| Maximum number of node pools in an AKS cluster | 16 |
30-
| Minimum number of nodes in a node pool | 1 <br /> Can't create empty node pools.|
31-
| Maximum number of nodes in a node pool | 64 |
32-
| Maximum number of total nodes in an AKS cluster | 200 |
33-
| Maximum number of AKS clusters per Azure Stack HCI cluster | 32 |
21+
| Scale item | Minimum | Maximum |
22+
|--------------|----------|---------|
23+
| Number of physical nodes in an Azure Stack HCI cluster | 1 | 16 |
24+
| Count of control plane nodes (Allowed values are 1, 3, and 5) | 1 | 5 |
25+
| Number of nodes in default node pool created during cluster create | 1 | 200 |
26+
| Number of node pools in an AKS cluster | 1 | 16 |
27+
| Number of nodes in a node pool (empty node pools not supported) | 1 | 64 |
28+
| Total number of nodes in an AKS cluster across nodepools | 1 | 200 |
29+
| Number of AKS clusters per Azure Stack HCI cluster | 0| 32 |
3430

3531
## Concurrency for AKS enabled by Arc
3632

37-
| Scale item  | Count  |
38-
|-----------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------|
39-
| Number of concurrent AKS cluster creations on an ARB  | 8  |
40-
| Number of concurrent node pool creations on an ARB  | 8  |
41-
| Number of concurrent operations across all different AKS clusters such as upgrade/scaling, etc., excluding creating node pool or clusters per ARB  | 32  |
42-
| Number of long running operations that can be run simultaneously on an AKS cluster  | 1 per cluster.  |
33+
| Scale item  | Count  |
34+
|-------------|--------|
35+
| Number of concurrent AKS cluster creations on an ARB  | 8 |
36+
| Number of concurrent node pool creations on an ARB  | 8  |
37+
| Number of concurrent operations across all different AKS clusters such as upgrade/scaling, etc., excluding creating node pool or clusters per ARB  | 32  |
38+
| Number of long running operations that can be run simultaneously on an AKS cluster  | 1 per cluster.  |
4339

4440
## Default values for virtual machine sizes
4541

4642
| System Role | VM Size | Memory, CPU |
4743
|---------------------------------|----------------------------------------|----------------------|
4844
| AKS Arc control plane nodes | Standard_A4_v2 | 8-GB memory, 4 vcpu |
49-
| AKS Arc HA Proxy VM | Standard_A4_v2. Can't be changed. | 8-GB memory, 4 vcpu |
45+
| AKS Arc HA Proxy VM | Standard_A4_v2. (This size is fixed and can't be changed) | 8-GB memory, 4 vcpu |
5046
| AKS Arc Linux worker node | Standard_K8S3_v1 | 6-GB memory, 4 vcpu |
5147
| AKS Arc Windows worker node | Standard_K8S3_v1 | 6-GB memory, 4 vcpu |
5248

‎azure-stack/asdk/asdk-telemetry.md

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ description: Learn how to configure Azure Stack telemetry settings using PowerSh
44
author: sethmanheim
55

66
ms.topic: article
7-
ms.date: 02/12/2019
7+
ms.date: 09/05/2024
88
ms.author: sethm
9-
ms.reviewer: misainat
109
ms.lastreviewed: 10/15/2019
1110

1211
# Intent: As an ASDK user, I want to learn about Azure Stack telemetry, so I can learn how use it, leverage it, and manage it.
@@ -101,39 +100,15 @@ Turning off Windows and Azure Stack telemetry disables SQL telemetry. For additi
101100
### Enable or disable telemetry after deployment
102101

103102
To enable or disable telemetry after deployment, you need to have access to the Privileged End Point (PEP) which is exposed on the ERCS VMs.
104-
1. To Enable: `Set-Telemetry -Enable`
105-
2. To Disable: `Set-Telemetry -Disable`
103+
104+
1. To Enable: `Set-Telemetry -Enable`
105+
1. To Disable: `Set-Telemetry -Disable`
106106

107107
PARAMETER Detail:
108108
> .PARAMETER Enable - Turn On telemetry data upload
109-
>
109+
>
110110
> .PARAMETER Disable - Turn Off telemetry data upload
111111
112-
**Script to enable telemetry:**
113-
```powershell
114-
$ip = "<IP ADDRESS OF THE PEP VM>" # You can also use the machine name instead of IP here.
115-
$pwd= ConvertTo-SecureString "<CLOUD ADMIN PASSWORD>" -AsPlainText -Force
116-
$cred = New-Object System.Management.Automation.PSCredential ("<DOMAIN NAME>\CloudAdmin", $pwd)
117-
$psSession = New-PSSession -ComputerName $ip -ConfigurationName PrivilegedEndpoint -Credential $cred -SessionOption (New-PSSessionOption -Culture en-US -UICulture en-US)
118-
Invoke-Command -Session $psSession {Set-Telemetry -Enable}
119-
if($psSession)
120-
{
121-
Remove-PSSession $psSession
122-
}
123-
```
124-
125-
**Script to disable telemetry:**
126-
```powershell
127-
$ip = "<IP ADDRESS OF THE PEP VM>" # You can also use the machine name instead of IP here.
128-
$pwd= ConvertTo-SecureString "<CLOUD ADMIN PASSWORD>" -AsPlainText -Force
129-
$cred = New-Object System.Management.Automation.PSCredential ("<DOMAIN NAME>\CloudAdmin", $pwd)
130-
$psSession = New-PSSession -ComputerName $ip -ConfigurationName PrivilegedEndpoint -Credential $cred -SessionOption (New-PSSessionOption -Culture en-US -UICulture en-US)
131-
Invoke-Command -Session $psSession {Set-Telemetry -Disable}
132-
if($psSession)
133-
{
134-
Remove-PSSession $psSession
135-
}
136-
```
137-
138112
## Next steps
139-
[Start and stop the ASDK](asdk-start-stop.md)
113+
114+
[Start and stop the ASDK](asdk-start-stop.md)

‎azure-stack/hci/concepts/physical-network-requirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ If your switch isn't included, contact your switch vendor to ensure that your sw
223223
> [!NOTE]
224224
> Guest RDMA requires both Compute (Standard) and Storage.
225225
226-
# [SuperMicro](#tab/SuperMicro)
226+
# [Supermicro](#tab/Supermicro)
227227
### 23H2
228228

229229
|Model |Firmware| Management | Storage | Compute (Standard)| Compute (SDN)|

0 commit comments

Comments
 (0)