Update upgrade docs (#3568)

* Update upgrade docs
Signed-off-by: Carlisia <carlisia@vmware.com>

* Update TOC
Signed-off-by: Carlisia <carlisia@vmware.com>

* The right next version is v1.6.0-beta.1
Signed-off-by: Carlisia <carlisia@vmware.com>

* Correct the listing order
Signed-off-by: Carlisia <carlisia@vmware.com>

site/content/docs/main/upgrade-to-1.5.md

----
-title: "Upgrading to Velero 1.5"
-layout: docs
----
-
-## Prerequisites
-
-- Velero [v1.4.x][5] installed.
-
-If you're not yet running at least Velero v1.4, see the following:
-
-- [Upgrading to v1.1][1]
-- [Upgrading to v1.2][2]
-- [Upgrading to v1.3][3]
-- [Upgrading to v1.4][4]
-
-## Instructions
-
-1. Install the Velero v1.5 command-line interface (CLI) by following the [instructions here][0].
-
-    Verify that you've properly installed it by running:
-
-    ```bash
-    velero version --client-only
-    ```
-
-    You should see the following output:
-
-    ```bash
-    Client:
-        Version: v1.5.1
-        Git commit: <git SHA>
-    ```
-
-1. Update the Velero custom resource definitions (CRDs) to include schema changes across all CRDs that are at the core of the new features in this release:
-
-    ```bash
-    velero install --crds-only --dry-run -o yaml | kubectl apply -f -
-    ```
-
-    **NOTE:** If you are upgrading Velero in Kubernetes 1.14.x or earlier, you will need to use `kubectl apply`'s `--validate=false` option when applying the CRD configuration above. See [issue 2077][6] and [issue 2311][7] for more context.
-
-1. Update the container image used by the Velero deployment and, optionally, the restic daemon set:
-
-    ```bash
-    kubectl set image deployment/velero \
-        velero=velero/velero:v1.5.1 \
-        --namespace velero
-
-    # optional, if using the restic daemon set
-    kubectl set image daemonset/restic \
-        restic=velero/velero:v1.5.1 \
-        --namespace velero
-    ```
-
-1. Confirm that the deployment is up and running with the correct version by running:
-
-    ```bash
-    velero version
-    ```
-
-    You should see the following output:
-
-    ```bash
-    Client:
-        Version: v1.5.1
-        Git commit: <git SHA>
-
-    Server:
-        Version: v1.5.1
-    ```
-
-[0]: basic-install.md#install-the-cli
-[1]: https://velero.io/docs/v1.1.0/upgrade-to-1.1/
-[2]: https://velero.io/docs/v1.2.0/upgrade-to-1.2/
-[3]: https://velero.io/docs/v1.3.2/upgrade-to-1.3/
-[4]: https://velero.io/docs/v1.4/upgrade-to-1.4/
-[5]: https://github.com/vmware-tanzu/velero/releases/tag/v1.4.2
-[6]: https://github.com/vmware-tanzu/velero/issues/2077
-[7]: https://github.com/vmware-tanzu/velero/issues/2311

site/content/docs/main/upgrade-to-1.6.md

@@ -29,7 +29,7 @@ If you're not yet running at least Velero v1.5, see the following:
 
     ```bash
     Client:
-        Version: v1.6.0
+        Version: v1.6.0-beta.1
         Git commit: <git SHA>
     ```
 
@@ -45,12 +45,12 @@ If you're not yet running at least Velero v1.5, see the following:
 
     ```bash
     kubectl set image deployment/velero \
-        velero=velero/velero:v1.6.0 \
+        velero=velero/velero:v1.6.0-beta.1 \
         --namespace velero
 
     # optional, if using the restic daemon set
     kubectl set image daemonset/restic \
-        restic=velero/velero:v1.6.0 \
+        restic=velero/velero:v1.6.0-beta.1 \
         --namespace velero
     ```
 
@@ -64,11 +64,11 @@ If you're not yet running at least Velero v1.5, see the following:
 
     ```bash
     Client:
-        Version: v1.6.0
+        Version: v1.6.0-beta.1
         Git commit: <git SHA>
 
     Server:
-        Version: v1.6.0
+        Version: v1.6.0-beta.1
     ```
 
 ## Notes

site/content/docs/v1.4/upgrade-to-1.4.md

@@ -5,7 +5,9 @@ layout: docs
 
 ## Prerequisites
 
-- Velero [v1.3.x][4] installed.
+- Velero [v1.4.2][8], [v1.4.0][7] or [v1.3.x][4] installed.
+
+Note: The v1.4.1 tag was created in code, but has no associated docker image due to misconfigured building infrastructure. v1.4.2 fixed this.
 
 If you're not yet running at least Velero v1.3, see the following:
 
@@ -27,7 +29,7 @@ If you're not yet running at least Velero v1.3, see the following:
 
     ```bash
     Client:
-        Version: v1.4.0
+        Version: v1.4.3
         Git commit: <git SHA>
     ```
 
@@ -35,12 +37,12 @@ If you're not yet running at least Velero v1.3, see the following:
 
     ```bash
     kubectl set image deployment/velero \
-        velero=velero/velero:v1.4.0 \
+        velero=velero/velero:v1.4.3 \
         --namespace velero
 
     # optional, if using the restic daemon set
     kubectl set image daemonset/restic \
-        restic=velero/velero:v1.4.0 \
+        restic=velero/velero:v1.4.3 \
         --namespace velero
     ```
 
@@ -62,11 +64,11 @@ If you're not yet running at least Velero v1.3, see the following:
 
     ```bash
     Client:
-        Version: v1.4.0
+        Version: v1.4.3
         Git commit: <git SHA>
 
     Server:
-        Version: v1.4.0
+        Version: v1.4.3
     ```
 
 [0]: basic-install.md#install-the-cli
@@ -76,3 +78,5 @@ If you're not yet running at least Velero v1.3, see the following:
 [4]: https://github.com/vmware-tanzu/velero/releases/tag/v1.3.2
 [5]: https://github.com/vmware-tanzu/velero/issues/2077
 [6]: https://github.com/vmware-tanzu/velero/issues/2311
+[7]: https://github.com/vmware-tanzu/velero/releases/tag/v1.4.0
+[8]: https://github.com/vmware-tanzu/velero/releases/tag/v1.4.2

site/content/docs/v1.5/upgrade-to-1.5.md

@@ -5,7 +5,7 @@ layout: docs
 
 ## Prerequisites
 
-- Velero [v1.4.x][5] installed.
+- Velero [v1.5.2][9], [v1.5.1][8] or [v1.4.x][5] installed.
 
 If you're not yet running at least Velero v1.4, see the following:
 
@@ -28,7 +28,7 @@ If you're not yet running at least Velero v1.4, see the following:
 
     ```bash
     Client:
-        Version: v1.5.1
+        Version: v1.5.3
         Git commit: <git SHA>
     ```
 
@@ -44,12 +44,12 @@ If you're not yet running at least Velero v1.4, see the following:
 
     ```bash
     kubectl set image deployment/velero \
-        velero=velero/velero:v1.5.1 \
+        velero=velero/velero:v1.5.3 \
         --namespace velero
 
     # optional, if using the restic daemon set
     kubectl set image daemonset/restic \
-        restic=velero/velero:v1.5.1 \
+        restic=velero/velero:v1.5.3 \
         --namespace velero
     ```
 
@@ -63,11 +63,11 @@ If you're not yet running at least Velero v1.4, see the following:
 
     ```bash
     Client:
-        Version: v1.5.1
+        Version: v1.5.3
         Git commit: <git SHA>
 
     Server:
-        Version: v1.5.1
+        Version: v1.5.3
     ```
 
 [0]: basic-install.md#install-the-cli
@@ -78,3 +78,5 @@ If you're not yet running at least Velero v1.4, see the following:
 [5]: https://github.com/vmware-tanzu/velero/releases/tag/v1.4.2
 [6]: https://github.com/vmware-tanzu/velero/issues/2077
 [7]: https://github.com/vmware-tanzu/velero/issues/2311
+[8]: https://github.com/vmware-tanzu/velero/releases/tag/v1.5.1
+[9]: https://github.com/vmware-tanzu/velero/releases/tag/v1.5.2

site/data/docs/main-toc.yml

@@ -13,8 +13,8 @@ toc:
         url: /basic-install
       - page: Customize Installation
         url: /customize-installation
-      - page: Upgrade to 1.5
-        url: /upgrade-to-1.5
+      - page: Upgrade to 1.6
+        url: /upgrade-to-1.6
       - page: Supported providers
         url: /supported-providers
       - page: Evaluation install