Skip to content

Commit d72f2c3

Browse files
authored
Sync release-hotfixes with main
Sync release-hotfixes with main
2 parents fb945ad + 55aa81e commit d72f2c3

File tree

50 files changed

+412
-478
lines changed

Some content is hidden

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

50 files changed

+412
-478
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,6 +1339,11 @@
13391339
"source_path": "azure-stack/user/vm-update-management.md",
13401340
"redirect_url": "/azure/azure-monitor/agents/agents-overview",
13411341
"redirect_document_id": false
1342+
},
1343+
{
1344+
"source_path": "azure-stack/hci/manage/processor-compatibility-mode.md",
1345+
"redirect_url": "/windows-server/virtualization/hyper-v/manage/dynamic-processor-compatibility-mode?pivots=azure-stack-hci",
1346+
"redirect_document_id": false
13421347
}
13431348
]
13441349
}

AKS-Hybrid/aks-edge-concept-clusters-nodes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: AKS Edge Essentials clusters and nodes
3-
description: Clusters and nodes running on AKS Edge Essentials
3+
description: Learn about clusters and nodes running on AKS Edge Essentials.
44
author: rcheeran
55
ms.author: rcheeran
66
ms.topic: conceptual
7-
ms.date: 10/06/2023
7+
ms.date: 07/11/2024
88
ms.custom: template-concept
99
---
1010

AKS-Hybrid/aks-edge-concept-networking.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Basic networking concepts for AKS Edge Essentials
44
author: fcabrera23
55
ms.author: fcabrera
66
ms.topic: conceptual
7-
ms.date: 10/06/2023
7+
ms.date: 07/11/2024
88
ms.custom: template-concept
99
---
1010

@@ -13,7 +13,7 @@ ms.custom: template-concept
1313
This article describes how to configure the networking between the Windows host OS and the Linux and Windows nodes' virtual machines. For more information about AKS Edge Essentials architecture, see the [AKS Edge Essentials overview](./aks-edge-overview.md).
1414

1515
>[!TIP]
16-
>The following guide describes different networking concepts and configurations available in AKS Edge Essentials. If you are using a single machine cluster, the installer and deployment mechanism handle all the necessary networking configuration. No extra steps or configuration are needed to deploy your cluster.
16+
>The following guide describes different networking concepts and configurations available in AKS Edge Essentials. If you use a single machine cluster, the installer and deployment mechanism handle all the necessary networking configuration. No extra steps or configuration are needed to deploy your cluster.
1717
1818
## Networking
1919

@@ -34,7 +34,7 @@ The following key networking concepts for AKS Edge Essentials align with Kuberne
3434

3535
If AKS Edge Essentials is deployed using a single machine cluster or a scalable cluster, we support different types of switches, IP address assignation, and configurations, as shown in the following table.
3636

37-
| | Single Machine Cluster | Scalable Cluster |
37+
| | Single machine cluster | Scalable cluster |
3838
| ------------------- | ---------------------- | ---------------- |
3939
| **Type of virtual switch** | Internal | External |
4040
| **Virtual switch creation** | Automatic | Manually by user or automatically based on physical net adapter name. |

AKS-Hybrid/aks-edge-deployment-config-json.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: AKS Edge Essentials deployment configuration JSON parameters
3-
description: Description of deployment configuration JSON parameters.
3+
description: Description of deployment configuration JSON parameters in AKS Edge Essentials.
44
author: yujinkim-msft
55
ms.author: yujinkim
66
ms.topic: conceptual
7-
ms.date: 10/03/2023
7+
ms.date: 07/11/2024
88
ms.custom: template-concept
99
---
1010

@@ -69,5 +69,5 @@ You can find the complete JSON schema file at `C:\Program Files\AksEdge\aksedge-
6969

7070
## Next steps
7171

72-
- [AKS Edge Essentials nodes and clusters](./aks-edge-concept-clusters-nodes.md)
73-
- [Set up your machine](./aks-edge-howto-setup-machine.md)
72+
- [AKS Edge Essentials nodes and clusters](aks-edge-concept-clusters-nodes.md)
73+
- [Set up your machine](aks-edge-howto-setup-machine.md)

AKS-Hybrid/aks-edge-howto-access-tpm.md

Lines changed: 29 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ description: Learn how to access the TPM from a Linux virtual machine.
44
author: rcheeran
55
ms.author: rcheeran
66
ms.topic: how-to
7-
ms.date: 10/10/2023
7+
ms.date: 07/12/2024
88
ms.custom: template-how-to, linux-related-content
99
---
1010

1111
# TPM access for AKS Edge Essentials
1212

13-
A [Trusted Platform Module (TPM)](/windows/security/information-protection/tpm/trusted-platform-module-top-node) chip is a secure crypto-processor that is designed to carry out cryptographic operations. This technology is designed to provide hardware-based, security-related functions. You can enable or disable the TPM passthrough feature that enables the AKS Edge Essentials virtual machine to use the Windows host OS TPM. The TPM passthrough feature provides read-only access to cryptographic keys stored inside the TPM.
13+
A [Trusted Platform Module (TPM) chip](/windows/security/information-protection/tpm/trusted-platform-module-top-node) is a secure crypto-processor that is designed to carry out cryptographic operations. This technology is designed to provide hardware-based, security-related functions. You can enable or disable the TPM passthrough feature that enables the AKS Edge Essentials virtual machine to use the Windows host OS TPM. The TPM passthrough feature provides read-only access to cryptographic keys stored inside the TPM.
1414

1515
This article describes how to develop sample code in C# to read cryptographic keys stored inside the device's discrete TPM.
1616

@@ -20,9 +20,7 @@ This article describes how to develop sample code in C# to read cryptographic ke
2020
## Prerequisites
2121

2222
- A Windows host OS with a TPM or vTPM (if you're using a Windows host OS virtual machine).
23-
2423
- Enable TPM access from the CBL-Mariner virtual machine with TPM passthrough enabled. In your **aksedge-config** file, in the `machines` section, set the `Machine.LinuxNode.TpmPassthrough` value to `True`. You can only enable or disable TPM access when creating a new deployment. Once you set the flag, it can't be changed unless you remove the deployment or node.
25-
2624
- Ensure that the Non-Volatile(NV) index (default index=3001) is initialized with 8 bytes of data. The default **AuthValue** used by the sample is **{1,2,3,4,5,6,7,8}**, which corresponds to the NV (Windows) sample in the **TSS.MSR** libraries when writing to the TPM. All index initialization must take place on the Windows host before reading from the CBL-Mariner VM. For more information about TPM samples, see [TSS.MSR](https://github.com/microsoft/TSS.MSR).
2725

2826
> [!CAUTION]
@@ -37,25 +35,17 @@ The following steps show how to create a sample executable to access a discrete
3735
:::image type="content" source="media/aks-edge/vs-new-solution.png" alt-text="Screenshot showing Visual Studio create new solution." lightbox="media/aks-edge/vs-new-solution.png":::
3836

3937
1. Type the **Project Name**, **Location** and **Solution Name** fields, then select **Next**.
40-
4138
1. Choose a target framework. The latest .NET 6.0 Long Term Support (LTS) version is preferred. After you choose a target framework, select **Create**. Visual Studio creates a new console app solution.
42-
4339
1. In **Solution Explorer**, right-click the project name and select **Manage NuGet Packages**.
44-
4540
1. Select **Browse** and then search for **Microsoft.TSS**. For more information about this package, see [Microsoft.TSS](https://www.nuget.org/packages/Microsoft.TSS). Choose the **Microsoft.TSS** package from the list, then select **Install**.
46-
4741
1. Edit the **Program.cs** file and replace the contents with the [tpm-read-nv sample code - Program.cs](https://github.com/Azure/iotedge-eflow/blob/main/samples/tpm-read-nv/Program.cs).
48-
4942
1. Select **Build > Build solution** to build the project. Verify that the build is successful.
50-
5143
1. In **Solution Explorer**, right-click the project, then select **Publish**.
52-
5344
1. In the **Publish** wizard, choose **Folder > Folder**. Select **Browse** and then choose an output location for the executable file to be generated. Select **Finish**. After the publish profile is created, select **Close**.
54-
5545
1. On the **Publish** tab, select **Show all settings**. Change the following configuration, then select **Save**:
5646

57-
- Target Runtime: **linux-x64**.
58-
- Deployment mode: **Self-contained**.
47+
- Target Runtime: **linux-x64**.
48+
- Deployment mode: **Self-contained**.
5949

6050
1. Select **Publish**, then wait for the executable to be created.
6151

@@ -66,37 +56,36 @@ If publishing succeeds, you should see the new files created in your output fold
6656
Once the executable file and dependency files are created, copy the folder to the CBL-Mariner virtual machine. The following steps show how to copy all the necessary files and how to run the executable inside the CBL-Mariner virtual machine.
6757

6858
1. Open an elevated PowerShell session.
59+
1. Change the directory to the parent folder that contains the published files.
6960

70-
1. Change directory to the parent folder that contains the published files.
71-
72-
For example, if your published files are under the folder **TPM** in the directory **C:\Users\<User>**, you can use the following command to change to the parent folder:
61+
For example, if your published files are under the folder **TPM** in the directory **C:\Users\<User>**, you can use the following command to change to the parent folder:
7362

74-
```powershell
75-
cd "C:\Users\<User>"
76-
```
63+
```powershell
64+
cd "C:\Users\<User>"
65+
```
7766

7867
1. Modify the **TPMRead.runtimeconfig.json** file to avoid an [ICU globalization issue](https://github.com/dotnet/core/issues/2186#issuecomment-472629489) inside the Linux VM:
7968

80-
1. Open **TPMRead.runtimeconfig.json**.
81-
2. Add the following line inside the `configProperties` section:
69+
1. Open **TPMRead.runtimeconfig.json**.
70+
2. Add the following line inside the `configProperties` section:
8271

83-
```json
84-
"System.Globalization.Invariant": true
85-
```
72+
```json
73+
"System.Globalization.Invariant": true
74+
```
8675

8776
1. Create a **tar** file with all the files created in previous steps.
8877

89-
For example, if you have all your files under the folder **TPM**, you can use the following command to create the **TPM.tar** file:
78+
For example, if you have all your files under the folder **TPM**, you can use the following command to create the **TPM.tar** file:
9079

91-
```powershell
92-
tar -cvzf TPM.tar ".\TPM"
93-
```
80+
```powershell
81+
tar -cvzf TPM.tar ".\TPM"
82+
```
9483

9584
1. Once the **TPM.tar** file is successfully created, use the `Copy-AksEdgeNodeFile` cmdlet to copy the **tar** file to the CBL-Mariner VM. For example, if you have the **tar** file name **TPM.tar** in the directory **C:\Users\<User>**, you can use the following command to copy to the CBL-Mariner VM:
9685

97-
```powershell
98-
Copy-AksEdgeNodeFile -fromFile "C:\Users\<User>\TPM.tar" -toFile "/home/aksedge-user/" -pushFile
99-
```
86+
```powershell
87+
Copy-AksEdgeNodeFile -fromFile "C:\Users\<User>\TPM.tar" -toFile "/home/aksedge-user/" -pushFile
88+
```
10089

10190
1. Run the following command to extract all the content from the **tar** file:
10291

@@ -106,19 +95,19 @@ Once the executable file and dependency files are created, copy the folder to th
10695

10796
1. After extraction, add executable permission to the main executable file. For example, if your project name was **TPMRead**, your main executable is named **TPMRead**. Run the following command to make it executable:
10897

109-
```powershell
110-
Invoke-AksEdgeNodeCommand -NodeType "Linux" -command "chmod +x /home/aksedge-user/TPM/TPMRead"
111-
```
98+
```powershell
99+
Invoke-AksEdgeNodeCommand -NodeType "Linux" -command "chmod +x /home/aksedge-user/TPM/TPMRead"
100+
```
112101

113102
1. The last step is to run the executable file. For example, if your project name is **TPMRead**, run the following command:
114103

115-
```powershell
116-
Invoke-AksEdgeNodeCommand -NodeType "Linux" -command "/home/aksedge-user/TPM/TPMRead"
117-
```
104+
```powershell
105+
Invoke-AksEdgeNodeCommand -NodeType "Linux" -command "/home/aksedge-user/TPM/TPMRead"
106+
```
118107

119-
You should see output similar to the following:
108+
You should see output similar to the following:
120109

121-
![Screenshot showing TPM output.](./media/aks-edge/tpm-read-output.png)
110+
![Screenshot showing TPM output.](./media/aks-edge/tpm-read-output.png)
122111

123112
## Next steps
124113

AKS-Hybrid/aks-edge-howto-expose-service.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ description: Learn how to expose a Kubernetes service with AKS Edge Essentials.
44
author: fcabrera23
55
ms.author: fcabrera
66
ms.topic: how-to
7-
ms.date: 10/12/2023
7+
ms.date: 07/12/2024
88
ms.custom: template-how-to
99
---
1010

1111
# Expose Kubernetes services to external devices
1212

13-
If you're working with Kubernetes applications, you might need to make Kubernetes services accessible to external devices so they can interact with the workloads you've deployed. This article explains how to expose Kubernetes services running on an AKS Edge Essentials cluster to external devices. Depending on the networking configuration you used to set up the Kubernetes cluster, there are two different ways to expose the services:
13+
If you work with Kubernetes applications, you might need to make Kubernetes services accessible to external devices so they can interact with the workloads you've deployed. This article explains how to expose Kubernetes services running on an AKS Edge Essentials cluster to external devices. Depending on the networking configuration you used to set up the Kubernetes cluster, there are two different ways to expose the services:
1414

1515
1. Single machine cluster with port forwarding.
16-
2. Scalable cluster with external virtual switch.
16+
1. Scalable cluster with external virtual switch.
1717

1818
> [!NOTE]
19-
> If you are using Kubernetes services, make sure to set up the `Init.ServiceIPRangeSize` and `Init.ServiceIPRangeStart` parameters during deployment. For more information, see [Deployment configuration JSON parameters](./aks-edge-deployment-config-json.md).
19+
> If you use Kubernetes services, make sure to set up the `Init.ServiceIPRangeSize` and `Init.ServiceIPRangeStart` parameters during deployment. For more information, see [Deployment configuration JSON parameters](./aks-edge-deployment-config-json.md).
2020
2121
## Option 1: single machine cluster with port forwarding
2222

AKS-Hybrid/aks-edge-howto-metric-server.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
2-
title: Deploy metric server
3-
description: Steps to deploy metric server.
2+
title: Deploy metrics server on an AKS Edge Essentials cluster
3+
description: Learn about the steps to deploy a metrics server on an AKS Edge Essentials cluster.
44
author: rcheeran
55
ms.author: rcheeran
66
ms.topic: how-to
7-
ms.date: 10/10/2023
7+
ms.date: 07/11/2024
88
ms.custom: template-how-to
99
---
1010

1111
# Metrics server on an AKS Edge Essentials cluster
1212

13-
The [metrics server](https://github.com/kubernetes-sigs/metrics-server) is a tool that inspects your containers' resource consumption. You can find the [YAML file](https://github.com/Azure/AKS-Edge/blob/main/samples/others/metrics-server.yaml) for the metrics server deployment in the **/Samples/Other** folder in the [GitHub repo](https://github.com/Azure/AKS-Edge/).
13+
The [metrics server](https://github.com/kubernetes-sigs/metrics-server) is a tool that inspects your containers' resource consumption. You can find the [YAML file](https://github.com/Azure/AKS-Edge/blob/main/samples/others/metrics-server.yaml) for the metrics server deployment in the **/Samples/Other** folder [in the GitHub repo](https://github.com/Azure/AKS-Edge/).
1414

1515
## Deploy metrics server
1616

0 commit comments

Comments
 (0)