Merge pull request #184394 from MikeRayMSFT/20220106-arc-upgrade

PRMerger3 · web-flow · commit d97b9e8af3d4 · 2022-01-07T09:58:06.000-08:00
Update version information in upgrade docs
diff --git a/articles/azure-arc/data/upgrade-data-controller-direct-cli.md b/articles/azure-arc/data/upgrade-data-controller-direct-cli.md
@@ -77,18 +77,20 @@ az arcdata dc upgrade --resource-group <resource group> --name <data controller
 The output for the preceding command is:
 
 ```output
-Preparing to upgrade dc arcdc in namespace arc to version 20211024.1.
-Preparing to upgrade dc arcdc in namespace arc to version 20211024.1.
+Preparing to upgrade dc arcdc in namespace arc to version <version-tag>.
+Preparing to upgrade dc arcdc in namespace arc to version <version-tag>.
 ****Dry Run****
-Arcdata Control Plane would be upgraded to: 20211024.1
+Arcdata Control Plane would be upgraded to: <version-tag>
 ```
 
-To upgrade the data controller, run the `az arcdata dc upgrade` command. If you don't specify a target image, the data controller will be upgraded to the latest version. The following example uses a local variable (`$version`) to use the version you selected previously ([View available images and chose a version](#view-available-images-and-chose-a-version)).
+To upgrade the data controller, run the `az arcdata dc upgrade` command. If you don't specify a target image, the data controller will be upgraded to the latest version.
 
 ```azurecli
-az arcdata dc upgrade --resource-group <resource group> --name <data controller name> --desired-version <version> [--no-wait]
+az arcdata dc upgrade --resource-group <resource group> --name <data controller name> [--no-wait]
 ```
 
+In example above, you can include `--desired-version <version>` to specify a version if you do not want the latest version. 
+
 ## Monitor the upgrade status
 
 You can monitor the progress of the upgrade with CLI.
diff --git a/articles/azure-arc/data/upgrade-data-controller-indirect-cli.md b/articles/azure-arc/data/upgrade-data-controller-indirect-cli.md
@@ -25,7 +25,7 @@ You will need an indirect mode data controller with the imageTag v1.0.0_2021-07-
 To check the version, run:
 
 ```console
-kubectl get datacontrollers -n -o custom-columns=BUILD:.spec.docker.imageTag
+kubectl get datacontrollers -n <namespace> -o custom-columns=BUILD:.spec.docker.imageTag
 ```
 
 ## Install tools
@@ -42,7 +42,7 @@ Before you can proceed with the tasks in this article you need to install:
 Pull the list of available images for the data controller with the following command:
 
    ```azurecli
-   az arcdata dc list-upgrades --k8s-namespace <namespace> –-use-k8s
+   az arcdata dc list-upgrades --k8s-namespace <namespace>
    ```
 
 The command above returns output like the following example:
@@ -76,23 +76,23 @@ az arcdata dc upgrade --desired-version <version> --k8s-namespace <namespace> --
 The output for the preceding command is:
 
 ```output
-Preparing to upgrade dc arcdc in namespace arc to version 20211024.1.
-Preparing to upgrade dc arcdc in namespace arc to version 20211024.1.
+Preparing to upgrade dc arcdc in namespace arc to version <version-tag>.
+Preparing to upgrade dc arcdc in namespace arc to version <version-tag>.
 ****Dry Run****
-Arcdata Control Plane would be upgraded to: 20211024.1
+Arcdata Control Plane would be upgraded to: <version-tag>
 ```
 
-To upgrade the data controller, run the `az arcdata dc upgrade` command. If you don't specify a target image, the data controller will be upgraded to the latest version. The following example uses a local variable (`$version`) to use the version you selected previously ([View available images and chose a version](#view-available-images-and-chose-a-version)).
+To upgrade the data controller, run the `az arcdata dc upgrade` command. If you don't specify a target image, the data controller will be upgraded to the latest version.
 
 ```azurecli
-az arcdata dc upgrade --desired-version $version --k8s-namespace <namespace> --use-k8s
+az arcdata dc upgrade --k8s-namespace <namespace> --use-k8s
 ```
 
 The output for the preceding command shows the status of the steps:
 
 ```output
-Preparing to upgrade dc arcdc in namespace arc to version 20211024.1.
-Preparing to upgrade dc arcdc in namespace arc to version 20211024.1.
+Preparing to upgrade dc arcdc in namespace arc to version <version-tag>.
+Preparing to upgrade dc arcdc in namespace arc to version <version-tag>.
 Creating service account: arc:cr-upgrade-worker
 Creating cluster role: arc:cr-upgrade-worker
 Creating cluster role binding: arc:crb-upgrade-worker
@@ -102,6 +102,8 @@ Service account arc:cr-upgrade-worker has been created successfully.
 Creating privileged job arc-elevated-bootstrapper-job
 ```
 
+In example above, you can include `--desired-version <version>` to specify a version if you do not want the latest version. 
+
 ## Monitor the upgrade status
 
 You can monitor the progress of the upgrade with kubectl or CLI.
diff --git a/articles/azure-arc/data/upgrade-data-controller-indirect-kubernetes-tools.md b/articles/azure-arc/data/upgrade-data-controller-indirect-kubernetes-tools.md
@@ -53,15 +53,15 @@ such as the Kubernetes dashboard, oc, or helm if you are familiar with those too
 Pull the list of available images for the data controller with the following command:
 
 ```azurecli
-az arcdata dc list-upgrades --k8s-namespace <namespace> –-use-k8s
+az arcdata dc list-upgrades --k8s-namespace <namespace>
  ```
 
 The command above returns output like the following example:
 
 ```output
-Found 2 valid versions.  The current datacontroller version is v1.0.0_2021-07-30.
-v1.1.0_2021-11-02
-v1.0.0_2021-07-30
+Found 2 valid versions.  The current datacontroller version is <current-version>.
+<available-version>
+...
 ```
 
 ## Create or download .yaml file
diff --git a/articles/azure-arc/data/upgrade-sql-managed-instance-cli.md b/articles/azure-arc/data/upgrade-sql-managed-instance-cli.md
@@ -40,7 +40,7 @@ The output will be:
 
 ```output
 Preparing to upgrade sql sqlmi-1 in namespace arc to data controller version.
-****Dry Run****1 instance(s) would be upgraded by this commandsqlmi-1 would be upgraded to 20211024.1.
+****Dry Run****1 instance(s) would be upgraded by this commandsqlmi-1 would be upgraded to <version-tag>.
 ```
 
 ### General Purpose
@@ -99,7 +99,7 @@ Status:
   Observed Generation:   2
   Primary Endpoint:      30.76.129.38,1433
   Ready Replicas:        1/1
-  Running Version:       20211024.1
+  Running Version:       <version-tag>
   State:                 Ready
 ```
 
diff --git a/articles/azure-arc/data/upgrade-sql-managed-instance-direct-cli.md b/articles/azure-arc/data/upgrade-sql-managed-instance-direct-cli.md
@@ -42,7 +42,7 @@ The output will be:
 
 ```output
 Preparing to upgrade sql sqlmi-1 in namespace arc to data controller version.
-****Dry Run****1 instance(s) would be upgraded by this commandsqlmi-1 would be upgraded to 20211024.1.
+****Dry Run****1 instance(s) would be upgraded by this commandsqlmi-1 would be upgraded to <version-tag>.
 ```
 
 ### General Purpose
@@ -95,7 +95,7 @@ Status:
   Observed Generation:   2
   Primary Endpoint:      30.76.129.38,1433
   Ready Replicas:        1/1
-  Running Version:       20211024.1
+  Running Version:       <version-tag>
   State:                 Ready
 ```
 
diff --git a/articles/azure-arc/data/upgrade-sql-managed-instance-indirect-kubernetes-tools.md b/articles/azure-arc/data/upgrade-sql-managed-instance-indirect-kubernetes-tools.md
@@ -87,7 +87,7 @@ Status:
   Observed Generation:   2
   Primary Endpoint:      30.76.129.38,1433
   Ready Replicas:        1/1
-  Running Version:       20211024.1
+  Running Version:       <version-tag>
   State:                 Ready
 ```
 
