Skip to content

Commit 7f47747

Browse files
Merge pull request #17137 from sethmanheim/ss2-20
Pull commits from Arc connect changes
2 parents 0069ccd + e1f8abf commit 7f47747

6 files changed

+24
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ You can find the complete JSON schema file at `C:\Program Files\AksEdge\aksedge-
2121
| `DeploymentType` |[`SingleMachineCluster` / `ScalableCluster`]| Specifies deployment type. In `ScalableCluster`, you can add more machines to the cluster infrastructure. | `SingleMachineCluster` |Single-machine and full deployment|
2222
| `Init.ServiceIPRangeStart` |IPv4 address `A.B.C.x`.|Reserved IP start address for your Kubernetes services. This IP range must be free on your subnet **A.B.C.0**.| None |Single-machine and full deployment|
2323
| `Init.ServiceIPRangeSize` |`[0-127]`|Number of reserved IP start addresses for your Kubernetes services. Based on the size, we allocate a range of free IP addresses on your subnet. | `0` |Single-machine and full deployment|
24-
| `Init.KmsPlugin.Enable` |Boolean| Enables the KMS plugin | false |Single-machine and full deployment|
24+
| `Init.KmsPlugin.Enable` | Boolean | Specifies whether the KMS plugin is enabled or not. | false | Single-machine and full deployment|
2525
| `Join.ClusterJoinToken` |String|`Reserved` | None |Full deployment only|
2626
| `Join.DiscoveryTokenHash` |String|`Reserved`| None |Full deployment only|
2727
| `Join.CertificateKey` |String|`Reserved`| None |Full deployment only|

AKS-Arc/aks-edge-howto-connect-to-arc.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ description: Connect your AKS Edge Essentials clusters to Arc
44
author: sethmanheim
55
ms.author: sethm
66
ms.topic: how-to
7-
ms.date: 09/27/2024
7+
ms.date: 02/20/2025
88
ms.custom: template-how-to
99
---
1010

1111
# Connect your AKS Edge Essentials cluster to Arc
1212

1313
This article describes how to connect your AKS Edge Essentials cluster to [Azure Arc](/azure/azure-arc/kubernetes/overview) so that you can monitor the health of your cluster on the Azure portal. If your cluster is connected to a proxy, you can use the scripts provided in the GitHub repo to connect your cluster to Arc [as described here](./aks-edge-howto-more-configs.md).
1414

15+
> [!IMPORTANT]
16+
> Starting with the AKS Edge Essentials February 2025 release, the `Arc` section of the config file is required. The Azure Arc connection occurs automatically after you run `New-AksEdgeDeployment` to deploy an AKS Edge Essentials cluster.
17+
1518
## Prerequisites
1619

1720
- Before connecting to Arc, infrastructure administrators who are the owner or contributor role of the subscription will have to:

AKS-Arc/aks-edge-howto-multi-node-deployment.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Describes how to create a cluster with multiple machines in AKS Edg
44
author: sethmanheim
55
ms.author: sethm
66
ms.topic: how-to
7-
ms.date: 01/09/2025
7+
ms.date: 02/20/2025
88
ms.custom: template-how-to
99
---
1010

@@ -52,6 +52,11 @@ The key parameters to note for a scalable Kubernetes deployment are:
5252
> [!IMPORTANT]
5353
> The Kubernetes `pod cidr` is `10.42.0.0/16` for K3s and `10.244.0.0/24` for K8s. The Kubernetes `service cidr` is `10.43.0.0/16` for K3s and `10.96.0.0/12` for K8s.
5454
55+
- `Arc`: This section is required. During the AKS Edge Essentials deployment, the Arc parameters are used to connect the AKS EE cluster to Azure Arc. For more information about the required Arc parameters, see the [connect to Arc documentation](aks-edge-howto-connect-to-arc.md).
56+
57+
> [!IMPORTANT]
58+
> Starting with the AKS Edge Essentials February 2025 release, the `Arc` section of the config file is required. The Azure Arc connection occurs automatically during AKS EE deployment.
59+
5560
- The `Network.NetworkPlugin` value by default is `flannel`. Flannel is the default CNI for a K3S cluster. In a K8S cluster, change the `NetworkPlugin` to `calico`.
5661
- In addition to the previous parameters, you can set the following parameters according to your deployment configuration, [as described here](aks-edge-deployment-config-json.md): `LinuxNode.CpuCount`, `LinuxNode.MemoryInMB`, `LinuxNode.DataSizeInGB`, `LinuxNode.Ip4Address`, `WindowsNode.CpuCount`, `WindowsNode.MemoryInMB`, `WindowsNode.Ip4Address`, `Init.ServiceIPRangeSize`, and `Network.InternetDisabled`.
5762

AKS-Arc/aks-edge-howto-single-node-deployment.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to deploy AKS Edge Essentials on a single machine.
44
author: sethmanheim
55
ms.author: sethm
66
ms.topic: how-to
7-
ms.date: 08/21/2024
7+
ms.date: 02/20/2024
88
ms.custom: template-how-to
99
---
1010

@@ -31,9 +31,14 @@ See [Deployment JSON configuration](aks-edge-deployment-config-json.md) for a de
3131
The key parameters for single machine deployment are:
3232

3333
- `DeploymentType`: This parameter defines the deployment type and is specified as `SingleMachineCluster`.
34+
- `Arc`: This section is required. During the AKS Edge Essentials deployment, the Arc parameters are used to connect the AKS EE cluster to Azure Arc. For more information about the required Arc parameters, see the [connect to Arc documentation](aks-edge-howto-connect-to-arc.md).
35+
3436
- The `Network.NetworkPlugin` by default is `flannel`. This is the default for a K3S cluster. If you're using a K8S cluster, change the CNI to `calico`.
3537
- You can set the following parameters according to your deployment configuration [as described here](aks-edge-deployment-config-json.md): `LinuxNode.CpuCount`, `LinuxNode.MemoryInMB`, `LinuxNode.DataSizeInGB`, `WindowsNode.CpuCount`, `WindowsNode.MemoryInMB`, `Init.ServiceIPRangeSize`, and `Network.InternetDisabled`.
3638

39+
> [!IMPORTANT]
40+
> Starting with the AKS Edge Essentials February 2025 release, the `Arc` section of the config file is required. The Azure Arc connection occurs automatically during the AKS EE deployment.
41+
3742
## Step 2: create a single machine cluster
3843

3944
1. You can now run the `New-AksEdgeDeployment` cmdlet to deploy a single-machine AKS Edge cluster with a single Linux control-plane node:

AKS-Arc/aks-edge-howto-uninstall.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to uninstall AKS Edge Essentials.
44
author: sethmanheim
55
ms.author: sethm
66
ms.topic: how-to
7-
ms.date: 07/11/2024
7+
ms.date: 02/20/2025
88
ms.custom:
99
- template-how-to
1010
- devx-track-azurecli
@@ -22,7 +22,7 @@ If you used `Connect-AideArcKubernetes` to connect to Azure Arc, run `Disconnect
2222
Disconnect-AideArcKubernetes
2323
```
2424

25-
If you used `Connect-AksEdgeArc` to connect to Arc, run `Disconnect-AksEdgeArc` to disconnect your cluster from Azure Arc:
25+
Run `Disconnect-AksEdgeArc` to disconnect your cluster from Azure Arc:
2626

2727
```powershell
2828
Disconnect-AksEdgeArc -JsonConfigFilePath .\aksedge-config.json

AKS-Arc/aks-edge-system-requirements.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Requirements and supported versions for AKS Edge Essentials.
44
author: sethmanheim
55
ms.author: sethm
66
ms.topic: conceptual
7-
ms.date: 09/10/2024
7+
ms.date: 02/20/2025
88
ms.custom: template-concept
99
---
1010

@@ -59,8 +59,11 @@ Install Windows 10/11 IoT Enterprise/Enterprise/Pro on your machine and activate
5959

6060
- **Deployment options**: Full Kubernetes deployment on multiple machines.
6161
- **Workloads**: Windows worker nodes.
62+
- **GPU**: [GPU-PV](aks-edge-gpu.md).
63+
- **Secret Encryption**: [KMS plugin for AKS EE](aks-edge-howto-secret-encryption.md).
64+
- **Security**: [Workload identity](aks-edge-workload-identity.md). Workload identity federation is only available for customers deploying Azure IoT Operations on top of AKS Edge Essentials.
6265
- **Network plugins**: Calico on K3S (discontinued).
6366

6467
## Next steps
6568

66-
- [Set up your machine](./aks-edge-howto-setup-machine.md)
69+
- [Set up your machine](aks-edge-howto-setup-machine.md)

0 commit comments

Comments
 (0)