Skip to content

Commit f3f6042

Browse files
committed
Address some Devarshi comments
1 parent 6e21701 commit f3f6042

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/current/_includes/common/upgrade/overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- **Major-version upgrades**: A [major-version upgrade]({% link releases/index.md %}#major-releases), such as from v24.2 to v24.3, may include new features, updates to cluster setting defaults, and backward-incompatible changes. Performing a major-version upgrade requires an additional step to finalize the upgrade.
44

55
{% if page.path contains "cockroachcloud" %}
6-
As of 2024, there are four major versions per year, where every second release is an [innovation release]({% link cockroachcloud/upgrade-policy.md %}#innovation-releases). For CockroachDB CockroachDB {{ site.data.products.advanced }}, innovation releases include all of the latest features but have shorter [support windows]({% link cockroachcloud/upgrade-policy.md %}#cockroachdb-cloud-support-policy) and can be skipped.
6+
As of 2024, there are four major versions per year, where every second release is an [Innovation release]({% link cockroachcloud/upgrade-policy.md %}#innovation-releases). For CockroachDB {{ site.data.products.advanced }}, Innovation releases include all of the latest features but have shorter [support windows]({% link cockroachcloud/upgrade-policy.md %}#cockroachdb-cloud-support-policy) and can be skipped.
77

88
For CockroachDB {{ site.data.products.standard }} and {{ site.data.products.basic }}, only Regular releases are supported. Major version upgrades are applied automatically to {{ site.data.products.standard }} and {{ site.data.products.basic }} clusters as they become available, and {{ site.data.products.standard }} clusters have the option to turn off automatic updates.
99
{% else %}
@@ -14,7 +14,7 @@
1414
A major version of CockroachDB has two phases of patch releases: a series of **testing releases** (beta, alpha, and RC releases) followed by a series of **production releases** (vX.Y.0, vX.Y.1, and so on). A major version’s first production release (the .0 release) is also known as its GA release.
1515

1616
{% if page.path contains "cockroachcloud" %}
17-
For all CockroachDB {{ site.data.products.cloud }} clusters, production patch releases for a major version are automatically applied until the cluster is upgraded to a new major version.
17+
For all CockroachDB {{ site.data.products.cloud }} clusters, production patch releases for a major version are automatically applied until the cluster is upgraded to a new major version. On an {{ site.data.products.advanced }} cluster, you have the option to defer patch updates for 30, 60, or 90 days if you have a [maintenance window]({% link cockroachcloud/advanced-cluster-management.md %}#set-a-maintenance-window) configured.
1818
{% endif %}
1919

2020
To learn more about CockroachDB major versions and patches, refer to the [Releases Overview]({% link releases/index.md %}#overview).

src/current/cockroachcloud/upgrade-policy.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ CockroachDB {{ site.data.products.advanced }} clusters optionally support **Inno
3737
When a CockroachDB {{ site.data.products.advanced }} cluster is nearing its EOS date, you will be reminded to upgrade the cluster at least 30 days before the EOS date to avoid losing support. {% capture who_can_upgrade %}A user with the Cluster Admin or Cluster Operator [role]({% link cockroachcloud/authorization.md %}) can [upgrade a cluster]({% link cockroachcloud/upgrade-cockroach-version.md %}) directly from the CockroachDB Cloud Console. An [Organization Admin]({% link cockroachcloud/authorization.md %}#organization-admin) can assign these roles.{% endcapture %}{{ who_can_upgrade }}
3838

3939
{{site.data.alerts.callout_info}}
40+
On CockroachDB Cloud {{ site.data.products.advanced }} clusters, the EOS date for Regular releases is shared between CockroachDB Cloud and CockroachDB Self-Hosted, meaning the EOS date for a Regular release on an {{ site.data.products.advanced }} cluster is identical to the [Self-Hosted release and support schedule]({% link releases/release-support-policy %}#supported-versions). This policy is applicable only to {{ site.data.products.advanced }}, whereas Regular releases on {{ site.data.products.standard }} and {{ site.data.products.basic }} are always supported for
41+
42+
4043
You are responsible for upgrading a CockroachDB {{ site.data.products.advanced }} cluster before its current version reaches its EOS date to maintain uninterrupted support and SLA guarantees.
4144
{{site.data.alerts.end}}
4245

@@ -46,7 +49,7 @@ Version | Release Type | Support period | Release date | EOS date
4649
:------:|:------------:|:--------------:|:------------:|:---------:
4750
v25.3 | Innovation | 6 months | 2025-08-04 | 2026-02-04
4851
v25.2 | Regular | 12 months | 2025-05-12 | 2026-05-12
49-
v24.3 | Regular | 12 months | 2024-11-18 | 2025-11-18
52+
v24.3 | Regular | 12 months | 2024-11-18 | 2026-05-05
5053

5154
To review a version's release notes, click its link in the Version column.
5255

0 commit comments

Comments
 (0)