diff --git a/_data/toc.yaml b/_data/toc.yaml index afbf3f296e..14bacf8366 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1436,7 +1436,7 @@ manuals: section: - path: /datacenter/ucp/3.0/guides/admin/monitor-and-troubleshoot/ title: Monitor the cluster status - - path: /datacenter/ucp/3.0/admin/monitor-and-troubleshoot/troubleshoot-node-messages/ + - path: /datacenter/ucp/3.0/guides/admin/monitor-and-troubleshoot/troubleshoot-node-messages/ title: Troubleshoot node messages - path: /datacenter/ucp/3.0/guides/admin/monitor-and-troubleshoot/troubleshoot-with-logs/ title: Troubleshoot with logs @@ -1558,8 +1558,6 @@ manuals: path: /datacenter/ucp/3.0/guides/user/interlock/usage/service-clusters/ - title: Context/Path based routing path: /datacenter/ucp/3.0/guides/user/interlock/usage/context/ - - title: VIP backend mode - path: /datacenter/ucp/3.0/guides/user/interlock/usage/interlock-vip-mode/ - title: Service labels reference path: /datacenter/ucp/3.0/guides/user/interlock/usage/labels-reference/ - title: Layer 7 routing upgrade @@ -1578,7 +1576,7 @@ manuals: path: /datacenter/ucp/3.0/guides/user/kubernetes/install-cni-plugin/ - path: /datacenter/ucp/3.0/reference/api/ title: API reference - - path: /ee/ucp/release-notes/ + - path: /ee/ucp/release-notes/#version-30 title: Release notes nosync: true - path: /datacenter/ucp/3.0/guides/get-support/ @@ -1743,7 +1741,7 @@ manuals: title: Grant access to secrets - path: /datacenter/ucp/2.2/reference/api/ title: API reference - - path: /ee/ucp/release-notes/ + - path: /ee/ucp/release-notes/#version-22 title: Release notes nosync: true - path: /datacenter/ucp/2.2/guides/get-support/ diff --git a/datacenter/ucp/3.0/guides/admin/install/upgrade.md b/datacenter/ucp/3.0/guides/admin/install/upgrade.md index 47a6b2271d..a01974bb97 100644 --- a/datacenter/ucp/3.0/guides/admin/install/upgrade.md +++ b/datacenter/ucp/3.0/guides/admin/install/upgrade.md @@ -1,11 +1,11 @@ --- -title: Upgrade to UCP 2.2 +title: Upgrade to UCP 3.0 description: Learn how to upgrade Docker Universal Control Plane with minimal impact to your users. keywords: UCP, upgrade, update --- This page guides you in upgrading Docker Universal Control Plane (UCP) to -version 2.2. +version 3.0. Before upgrading to a new version of UCP, check the [release notes](../../release-notes/index.md) for this version for information @@ -37,8 +37,8 @@ This allows you to recover if something goes wrong during the upgrade process. > Upgrading and backup archives > > The backup archive is version-specific, so you can't use it during the -> upgrade process. For example, if you create a backup archive for a UCP 2.1 -> swarm, you can't use the archive file after you upgrade to UCP 2.2. +> upgrade process. For example, if you create a backup archive for a UCP 2.2 +> swarm, you can't use the archive file after you upgrade to UCP 3.0. ## Upgrade Docker Engine @@ -112,13 +112,13 @@ all the nodes managed by UCP are healthy. ## Recommended upgrade paths -If you're running a UCP version that's lower than 2.1, first upgrade to the -latest 2.1 version, then upgrade to 2.2. Use these rules for your upgrade -path to UCP 2.2: +If you're running a UCP version that's lower than 2.2, first upgrade to the +latest 2.2 version, then upgrade to 3.0. Use these rules for your upgrade +path to UCP 3.0: -- From UCP 1.1: UCP 1.1 -> UCP 2.1 -> UCP 2.2 -- From UCP 2.0: UCP 2.0 -> UCP 2.1 -> UCP 2.2 -- From UCP 2.1: UCP 2.1 -> UCP 2.2 +- From UCP 1.1: UCP 1.1 -> UCP 2.2 -> UCP 3.0 +- From UCP 2.0: UCP 2.0 -> UCP 2.2 -> UCP 3.0 +- From UCP 2.2: UCP 2.2 -> UCP 3.0 ## Where to go next diff --git a/datacenter/ucp/3.0/guides/index.md b/datacenter/ucp/3.0/guides/index.md index ac171fe4ff..626dbe7c3c 100644 --- a/datacenter/ucp/3.0/guides/index.md +++ b/datacenter/ucp/3.0/guides/index.md @@ -3,9 +3,6 @@ title: Universal Control Plane overview description: | Learn about Docker Universal Control Plane, the enterprise-grade cluster management solution from Docker. keywords: ucp, overview, orchestration, cluster -redirect_from: - - /ucp/ - - /datacenter/ucp/3.0/guides/ --- Docker Universal Control Plane (UCP) is the enterprise-grade cluster management diff --git a/ee/ucp/admin/install/index.md b/ee/ucp/admin/install/index.md index e754fea706..2f9340829b 100644 --- a/ee/ucp/admin/install/index.md +++ b/ee/ucp/admin/install/index.md @@ -2,8 +2,6 @@ title: Install UCP for production description: Learn how to install Docker Universal Control Plane on production. keywords: Universal Control Plane, UCP, install, Docker EE -redirect_from: - - /datacenter/ucp/3.0/guides/admin/install/ --- Docker Universal Control Plane (UCP) is a containerized application that you diff --git a/ee/ucp/index.md b/ee/ucp/index.md index ac171fe4ff..e8bc8a4625 100644 --- a/ee/ucp/index.md +++ b/ee/ucp/index.md @@ -5,7 +5,6 @@ description: | keywords: ucp, overview, orchestration, cluster redirect_from: - /ucp/ - - /datacenter/ucp/3.0/guides/ --- Docker Universal Control Plane (UCP) is the enterprise-grade cluster management diff --git a/ee/ucp/user-access/cli.md b/ee/ucp/user-access/cli.md index 4d52ade24d..afcfcfc78f 100644 --- a/ee/ucp/user-access/cli.md +++ b/ee/ucp/user-access/cli.md @@ -3,7 +3,6 @@ title: CLI-based access description: Learn how to access Docker Universal Control Plane from the CLI. keywords: ucp, cli, administration redirect_from: - - /datacenter/ucp/3.0/guides/user/access-ucp/cli-based-access/ - /ee/ucp/user/access-ucp/cli-based-access/ ---