Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
jkirschner-hashicorp committed Apr 7, 2023
1 parent 8b549ff commit 88e60eb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
11 changes: 6 additions & 5 deletions website/content/docs/upgrading/instructions/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ to plan your upgrade, starting from the next version and working
upwards to your target version.

For example, to upgrade from Consul 1.12 to Consul 1.15:

1. Upgrade to Consul 1.14 as an intermediate step.
To plan, review the upgrade details for
[1.13](/consul/docs/upgrading/upgrade-specific#consul-1-13-x) and
[1.14](/consul/docs/upgrading/upgrade-specific#consul-1-14-x).
2. Upgrade to Consul 1.15.
1. Upgrade to Consul 1.15.
To plan, review the upgrade details for
[1.15](/consul/docs/upgrading/upgrade-specific#consul-1-15-x).

Expand All @@ -37,10 +38,10 @@ to a destination version.

| Starting Version Range | Destination Version | Upgrade Instructions |
| ---------------------- | ------------------- | -------------------- |
| 1.8.0 - 1.9.17 | 1.10.12 | Follow the [instructions for upgrading to final 1.10.x](/consul/docs/upgrading/instructions/upgrade-to-1-10-x) |
| 1.6.9 - 1.8.18 | 1.8.19 | Follow the [instructions for upgrading to final 1.8.x](/consul/docs/upgrading/instructions/upgrade-to-1-8-x) |
| 1.2.4 - 1.6.9 | 1.6.10 | Follow the [instructions for upgrading to final 1.6.x](/consul/docs/upgrading/instructions/upgrade-to-1-6-x) |
| 0.8.5 - 1.2.3 | 1.2.4 | Follow the [instructions for upgrading to final 1.2.x](/consul/docs/upgrading/instructions/upgrade-to-1-2-x) |
| 1.8.0 - 1.9.17 | 1.10.12 | Refer to [upgrading to latest 1.10.x](/consul/docs/upgrading/instructions/upgrade-to-1-10-x) |
| 1.6.9 - 1.8.18 | 1.8.19 | Refer to [upgrading to latest 1.8.x](/consul/docs/upgrading/instructions/upgrade-to-1-8-x) |
| 1.2.4 - 1.6.9 | 1.6.10 | Refer to [upgrading to latest 1.6.x](/consul/docs/upgrading/instructions/upgrade-to-1-6-x) |
| 0.8.5 - 1.2.3 | 1.2.4 | Refer to [upgrading to latest 1.2.x](/consul/docs/upgrading/instructions/upgrade-to-1-2-x) |

For example, to upgrade from Consul 1.3.1 to latest 1.12:
1. Upgrade to Consul 1.6.10 using the dedicated instructions.
Expand Down
11 changes: 7 additions & 4 deletions website/content/docs/upgrading/upgrade-specific.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -515,10 +515,13 @@ to Consul 1.11.11 or later to avoid the breaking nature of that change.

### Licensing Changes <EnterpriseAlert inline />

You can only upgrade to Consul Enterprise 1.10 from a version of
Consul Enterprise 1.8 >= 1.8.13 or 1.9 >= 1.9.7. Other versions of
Consul Enterprise are not forward compatible with v1.10 and will
cause issues during the upgrade that could result in agents failing to start due to [changes in the way we manage licenses](/consul/docs/enterprise/license/faq).
You can only upgrade to Consul Enterprise 1.10 from the following Enterprise versions:
- 1.8 release series: 1.8.13+
- 1.9 release series: 1.9.7+

Other versions of Consul Enterprise are not forward compatible with v1.10 and will
cause issues during the upgrade that could result in agents failing to start due to
[changes in the way we manage licenses](/consul/docs/enterprise/license/faq).

Consul Enterprise 1.10 has removed temporary licensing capabilities from the binaries
found on https://releases.hashicorp.com. Servers will no longer load a license previously
Expand Down

0 comments on commit 88e60eb

Please sign in to comment.