Skip to content

Commit 8eb6998

Browse files
sethmanheimsethmanheim
authored
Sync release-hotfixes with main
Sync release-hotfixes with main
2 parents 760419b + a0c7ae7 commit 8eb6998

16 files changed

+209
-98
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-setup-machine.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to prepare your machines for AKS Edge Essentials clusters
44
author: rcheeran
55
ms.author: rcheeran
66
ms.topic: how-to
7-
ms.date: 08/19/2024
7+
ms.date: 09/04/2024
88
ms.custom: template-how-to
99
---
1010

@@ -26,15 +26,14 @@ You can deploy an AKS Edge Essentials cluster on either a single machine or on m
2626

2727
1. On your machine, download the **AksEdge-k3s.msi** or **AksEdge-k8s.msi** file, depending on which Kubernetes distribution you want to use. Also, if you're creating a Windows worker node, you'll need the Windows node files.
2828

29-
| File | Link |
30-
| ---- | ---- |
31-
| K8s installer (1.28.3) | [aka.ms/aks-edge/k8s-msi](https://aka.ms/aks-edge/k8s-msi) |
32-
| K3s installer (1.28.3) | [aka.ms/aks-edge/k3s-msi](https://aka.ms/aks-edge/k3s-msi) |
33-
| K8s installer (1.27.6) | [aka.ms/aks-edge/k8s-msi-1.27](https://aka.ms/aks-edge/k8s-msi-1.27) |
34-
| K3s installer (1.27.6) | [aka.ms/aks-edge/k3s-msi-1.27](https://aka.ms/aks-edge/k3s-msi-1.27) |
35-
| K8s installer (1.26.6) | [aka.ms/aks-edge/k8s-msi-1.26](https://aka.ms/aks-edge/k8s-msi-1.26) |
36-
| K3s installer (1.26.10) | [aka.ms/aks-edge/k3s-msi-1.26](https://aka.ms/aks-edge/k3s-msi-1.26) |
37-
| Windows node files | [aka.ms/aks-edge/windows-node-zip](https://aka.ms/aks-edge/windows-node-zip) |
29+
| File | Link |
30+
| ---- | ---- |
31+
| K8s installer (1.29.4) | [aka.ms/aks-edge/k8s-msi](https://aka.ms/aks-edge/k8s-msi) |
32+
| K3s installer (1.29.6) | [aka.ms/aks-edge/k3s-msi](https://aka.ms/aks-edge/k3s-msi) |
33+
| K8s installer (1.28.9) | [aka.ms/aks-edge/k8s-msi-1.28](https://aka.ms/aks-edge/k8s-msi-1.28) |
34+
| K3s installer (1.28.5) | [aka.ms/aks-edge/k3s-msi-1.28](https://aka.ms/aks-edge/k3s-msi-1.28) |
35+
| K8s installer (1.27.6) | [aka.ms/aks-edge/k8s-msi-1.27](https://aka.ms/aks-edge/k8s-msi-1.27) |
36+
| K3s installer (1.27.6) | [aka.ms/aks-edge/k3s-msi-1.27](https://aka.ms/aks-edge/k3s-msi-1.27) |
3837

3938
1. In addition to the MSI, Microsoft provides samples and tools that you can download from the [AKS Edge GitHub repo](https://github.com/Azure/AKS-Edge). Navigate to the **Code** tab and click the **Download Zip** button to download the repository as a **.zip** file. Extract the GitHub **.zip** file to a local folder.
4039
1. Before you install, make sure you uninstall any private preview installations and reboot your system before proceeding.

‎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

‎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/deploy/media/deployment-azure-resource-manager-template/select-view-error-details-1.png

-27.7 KB
Loading

0 commit comments

Comments
 (0)