Skip to content

Commit 12a3761

Browse files
committed
Review docs for bugbash2
1 parent faa2a09 commit 12a3761

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

articles/iot-operations/deploy-iot-ops/howto-deploy-iot-operations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Development resources:
7373

7474
A cluster host:
7575

76-
* An Azure Arc-enabled Kubernetes cluster with the custom location and workload identity features enabled. If you don't have one, follow the steps in [Prepare your Azure Arc-enabled Kubernetes cluster](./howto-prepare-cluster.md?tabs=wsl-ubuntu).
76+
* An Azure Arc-enabled Kubernetes cluster with the custom location and workload identity features enabled. If you don't have one, follow the steps in [Prepare your Azure Arc-enabled Kubernetes cluster](./howto-prepare-cluster.md).
7777

7878
If you deployed Azure IoT Operations to your cluster previously, uninstall those resources before continuing. For more information, see [Update Azure IoT Operations](./howto-manage-update-uninstall.md#update).
7979

articles/iot-operations/deploy-iot-ops/howto-prepare-cluster.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ Microsoft supports AKS Edge Essentials for deployments on Windows and K3s for de
2929

3030
To prepare your Azure Arc-enabled Kubernetes cluster, you need:
3131

32-
* Hardware that meets the [system requirements](/azure/azure-arc/kubernetes/system-requirements).
33-
3432
### [AKS Edge Essentials](#tab/aks-edge-essentials)
3533

3634
* An Azure subscription. If you don't have an Azure subscription, [create one for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
@@ -88,12 +86,17 @@ This section provides steps to create clusters in validated environments on Linu
8886
The [AksEdgeQuickStartForAio.ps1](https://github.com/Azure/AKS-Edge/blob/main/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStartForAio.ps1) script automates the process of creating and connecting a cluster, and is the recommended path for deploying Azure IoT Operations on AKS Edge Essentials.
8987

9088
> [!NOTE]
91-
> The instructions below are for external customer consumption and will only work after AIO 0.7 is released.
92-
> For internal bug bashes, use these instructions instead: https://msazure.visualstudio.com/One/_wiki/wikis/AIO.wiki/714254/Setup-AKS-EE-with-WLIF-for-AIO-M2
93-
89+
> The instructions below are for external customer consumption and will only work after AIO 0.7 is released.
90+
> For internal bug bashes, use these instructions instead: https://msazure.visualstudio.com/One/_wiki/wikis/AIO.wiki/714254/Setup-AKS-EE-with-WLIF-for-AIO-M2
9491
9592
1. Open an elevated PowerShell window and change the directory to a working folder.
9693

94+
1. Get the `objectId` of the Microsoft Entra ID application that the Azure Arc service uses in your tenant.
95+
96+
```azurecli
97+
az ad sp show --id bc313c14-388c-4e7d-a58e-70017303ee3b --query id -o tsv
98+
```
99+
97100
1. Run the following commands, replacing the placeholder values with your information:
98101

99102
| Placeholder | Value |
@@ -103,13 +106,14 @@ The [AksEdgeQuickStartForAio.ps1](https://github.com/Azure/AKS-Edge/blob/main/to
103106
| RESOURCE_GROUP_NAME | The name of an existing resource group or a name for a new resource group to be created. |
104107
| LOCATION | An Azure region close to you. For the list of currently supported Azure regions, see [Supported regions](../overview-iot-operations.md#supported-regions). |
105108
| CLUSTER_NAME | A name for the new cluster to be created. |
109+
| ARC_APP_OBJECT_ID | The object ID value that you retrieved in the previous step. |
106110

107111
```powershell
108112
$url = "https://raw.githubusercontent.com/Azure/AKS-Edge/main/tools/scripts/AksEdgeQuickStart/AksEdgeQuickStartForAio.ps1"
109113
Invoke-WebRequest -Uri $url -OutFile .\AksEdgeQuickStartForAio.ps1
110114
Unblock-File .\AksEdgeQuickStartForAio.ps1
111115
Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process -Force
112-
.\AksEdgeQuickStartForAio.ps1 -SubscriptionId "<SUBSCRIPTION_ID>" -TenantId "<TENANT_ID>" -ResourceGroupName "<RESOURCE_GROUP_NAME>" -Location "<LOCATION>" -ClusterName "<CLUSTER_NAME>"
116+
.\AksEdgeQuickStartForAio.ps1 -SubscriptionId "<SUBSCRIPTION_ID>" -TenantId "<TENANT_ID>" -ResourceGroupName "<RESOURCE_GROUP_NAME>" -Location "<LOCATION>" -ClusterName "<CLUSTER_NAME>" --CustomLocationOid "<ARC_APP_OBJECT_ID>"
113117
```
114118

115119
If there are any issues during deployment, including if your machine reboots as part of this process, run the whole set of commands again.

articles/iot-operations/includes/connect-cluster-k3s.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ ms.custom: include file, ignite-2023, devx-track-azurecli
3333
1. Download and install a preview version of the `connectedk8s` extension for Azure CLI.
3434

3535
```azurecli
36-
az storage blob download --auth-mode login --blob-url https://github.com/AzureArcForKubernetes/azure-cli-extensions/blob/connectedk8s/public/cli-extensions/connectedk8s-1.10.0-py2.py3-none-any.whl -f ./connectedk8s-1.10.0-py2.py3-none-any.whl
37-
38-
az extension add --upgrade --source ./connectedk8s-1.10.0-py2.py3-none-any.whl
36+
curl -L -o connectedk8s-1.10.0-py2.py3-none-any.whl https://github.com/AzureArcForKubernetes/azure-cli-extensions/raw/refs/heads/connectedk8s/public/cli-extensions/connectedk8s-1.10.0-py2.py3-none-any.whl
37+
az extension add --upgrade --source connectedk8s-1.10.0-py2.py3-none-any.whl
3938
```
4039

4140
1. Use the [az connectedk8s connect](/cli/azure/connectedk8s#az-connectedk8s-connect) command to Arc-enable your Kubernetes cluster and manage it as part of your Azure resource group:
@@ -85,7 +84,7 @@ ms.custom: include file, ignite-2023, devx-track-azurecli
8584
8685
1. Save the file and exit the nano editor.
8786
88-
1. Get the `objectId` of the Microsoft Entra ID application that the Azure Arc service uses and save it as an environment variable.
87+
1. Get the `objectId` of the Microsoft Entra ID application that the Azure Arc service uses in your tenant and save it as an environment variable.
8988

9089
```azurecli
9190
export OBJECT_ID=$(az ad sp show --id bc313c14-388c-4e7d-a58e-70017303ee3b --query id -o tsv)

0 commit comments

Comments
 (0)