Skip to content

Commit cfc8fba

Browse files
authored
Merge pull request #251347 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 7c03628 + 4645d75 commit cfc8fba

File tree

4 files changed

+9
-39
lines changed

4 files changed

+9
-39
lines changed

articles/azure-arc/data/upgrade-data-controller-direct-cli.md

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -75,41 +75,6 @@ You'll need to connect and authenticate to a Kubernetes cluster and have an exis
7575
kubectl config use-context <Kubernetes cluster name>
7676
```
7777

78-
### Upgrade Arc data controller extension
79-
80-
Upgrade the Arc data controller extension first.
81-
82-
Retrieve the name of your extension and its version:
83-
84-
1. Go to the Azure portal
85-
1. Select **Overview** for your Azure Arc enabled Kubernetes cluster
86-
1. Selecting the **Extensions** tab on the left.
87-
88-
Alternatively, you can use `az` CLI to get the name of your extension and its version running.
89-
90-
```azurecli
91-
az k8s-extension list --resource-group <resource-group> --cluster-name <connected cluster name> --cluster-type connectedClusters
92-
```
93-
94-
Example:
95-
96-
```azurecli
97-
az k8s-extension list --resource-group rg-arcds --cluster-name aks-arc --cluster-type connectedClusters
98-
```
99-
100-
After you retrieve the extension name and its version, upgrade the extension.
101-
102-
```azurecli
103-
az k8s-extension update --resource-group <resource-group> --cluster-name <connected cluster name> --cluster-type connectedClusters --name <name of extension> --version <extension version> --release-train stable --config systemDefaultValues.image="<registry>/<repository>/arc-bootstrapper:<imageTag>"
104-
```
105-
106-
Example:
107-
108-
```azurecli
109-
az k8s-extension update --resource-group rg-arcds --cluster-name aks-arc --cluster-type connectedClusters --name aks-arc-ext --version
110-
1.2.19581002 --release-train stable --config systemDefaultValues.image="mcr.microsoft.com/arcdata/arc-bootstrapper:v1.7.0_2022-05-24"
111-
```
112-
11378
### Upgrade data controller
11479

11580
You can perform a dry run first. The dry run validates the registry exists, the version schema, and the private repository authorization token (if used). To perform a dry run, use the `--dry-run` parameter in the `az arcdata dc upgrade` command. For example:

articles/cloud-shell/troubleshooting.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ TODO:
223223
- Should we be using a newer API version?
224224
-->
225225
```bash
226-
token=$(curl http://localhost:50342/oauth2/token --data "resource=https://management.azure.com/" -H Metadata:true -s | jq -r ".accessToken")
226+
token=$(curl http://localhost:50342/oauth2/token --data "resource=https://management.azure.com/" -H Metadata:true -s | jq -r ".access_token")
227227
curl https://management.azure.com/providers/Microsoft.Portal/usersettings/cloudconsole?api-version=2017-12-01-preview -H Authorization:"Bearer $token" -s | jq
228228
```
229229

@@ -234,7 +234,7 @@ TODO:
234234
Uri = "$env:MSI_ENDPOINT`?resource=https://management.core.windows.net/"
235235
Headers = @{Metadata='true'}
236236
}
237-
$token= ((Invoke-WebRequest @parameters ).content | ConvertFrom-Json).accessToken
237+
$token= ((Invoke-WebRequest @parameters ).content | ConvertFrom-Json).access_token
238238
$parameters = @{
239239
Uri = 'https://management.azure.com/providers/Microsoft.Portal/usersettings/cloudconsole?api-version=2017-12-01-preview'
240240
Headers = @{Authorization = "Bearer $token"}
@@ -259,7 +259,7 @@ again.
259259
Bash:
260260

261261
```bash
262-
TOKEN=$(az account get-access-token --resource "https://management.azure.com/" | jq -r ".accessToken")
262+
TOKEN=$(az account get-access-token --resource "https://management.azure.com/" | jq -r ".access_token")
263263
curl -X DELETE https://management.azure.com/providers/Microsoft.Portal/usersettings/cloudconsole?api-version=2017-12-01-preview -H Authorization:"Bearer $TOKEN"
264264
```
265265

articles/hdinsight/hadoop/apache-hadoop-visual-studio-tools-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ keywords: hadoop tools,hive query,visual studio,visual studio hadoop
55
ms.service: hdinsight
66
ms.custom: hdinsightactive,hdiseo17may2017,seodec18
77
ms.topic: how-to
8-
ms.date: 08/05/2022
8+
ms.date: 09/13/2023
99
---
1010

1111
# Use Data Lake Tools for Visual Studio to connect to Azure HDInsight and run Apache Hive queries

articles/iot-hub-device-update/device-update-raspberry-pi.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,11 @@ Read the license terms prior to using the agent. Your installation and use const
225225
}
226226
```
227227
228+
:::image type="content" source="media/import-update/device-twin-ppr.png" alt-text="Screenshot that shows twin with tag information." lightbox="media/import-update/device-twin-ppr.png":::
229+
230+
_This screenshot shows the section where the tag needs to be added in the twin._
231+
232+
228233
## Import the update
229234
230235
1. Download the sample tutorial manifest and sample update (.swu file) and the sample A/B script from [Tutorial_RaspberryPi.zip](https://github.com/Azure/iot-hub-device-update/releases/download/1.0.2/Tutorial_RaspberryPi.zip) under **Release Assets** for the latest agent.

0 commit comments

Comments
 (0)