Skip to content

Commit f421979

Browse files
authored
Merge branch 'main' into v25.2.0-alpha.1-release-notes-fix
2 parents d24f9d7 + f6df22e commit f421979

15 files changed

+7453
-16
lines changed

.github/workflows/vale.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ jobs:
1111

1212
- name: Get changed files
1313
id: changed_files
14-
uses: tj-actions/[email protected]
14+
# This is v41.0.0. Hardcoded the commit because the tag was compromised.
15+
uses: tj-actions/changed-files@cc08e170f4447237bcaf8acaacfa615b9cb86612
1516

1617
- name: Calculate changed files to pass to Vale
1718
id: calc_changed_files

src/current/_data/releases.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8398,7 +8398,7 @@
83988398

83998399
- release_name: v25.1.1
84008400
major_version: v25.1
8401-
release_date: '2025-03-12'
8401+
release_date: '2025-03-11'
84028402
release_type: Production
84038403
go_version: go1.23.6
84048404
sha: a5c682ed7f4b1e42717616d676ff14d6e6a8b192
@@ -8450,13 +8450,6 @@
84508450
docker_arm_limited_access: false
84518451
source: true
84528452
previous_release: v25.1.1
8453-
cloud_only: true
8454-
cloud_only_message_short: 'Available only for select CockroachDB Cloud clusters'
8455-
cloud_only_message: >
8456-
This version is currently available only for select
8457-
CockroachDB Cloud clusters. To request to upgrade
8458-
a CockroachDB self-hosted cluster to this version,
8459-
[contact support](https://support.cockroachlabs.com/hc/requests/new).
84608453

84618454

84628455

src/current/_includes/v24.3/sidebar-data/stream-data.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,17 @@
4747
"title": "Monitor Changefeeds",
4848
"items": [
4949
{
50-
"title": "Monitor and Debug Changefeeds",
50+
"title": "Overview",
5151
"urls": [
5252
"/${VERSION}/monitor-and-debug-changefeeds.html"
5353
]
5454
},
55+
{
56+
"title": "Monitoring Guide",
57+
"urls": [
58+
"/${VERSION}/changefeed-monitoring-guide.html"
59+
]
60+
},
5561
{
5662
"title": "Protect Changefeed Data",
5763
"urls": [

src/current/_includes/v25.1/sidebar-data/stream-data.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,16 @@
4747
"title": "Monitor Changefeeds",
4848
"items": [
4949
{
50-
"title": "Monitor and Debug Changefeeds",
51-
"urls": [
52-
"/${VERSION}/monitor-and-debug-changefeeds.html"
53-
]
50+
"title": "Overview",
51+
"urls": [
52+
"/${VERSION}/monitor-and-debug-changefeeds.html"
53+
]
54+
},
55+
{
56+
"title": "Monitoring Guide",
57+
"urls": [
58+
"/${VERSION}/changefeed-monitoring-guide.html"
59+
]
5460
},
5561
{
5662
"title": "Protect Changefeed Data",

src/current/cockroachcloud/provision-a-cluster-with-terraform.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@ In this tutorial, you will create a CockroachDB {{ site.data.products.basic }} c
8181
8282
{% include_cached copy-clipboard.html %}
8383
~~~ hcl
84+
terraform {
85+
required_providers {
86+
cockroach = {
87+
source = "cockroachdb/cockroach"
88+
}
89+
}
90+
}
91+
8492
resource "cockroach_cluster" "basic" {
8593
name = "cockroach-basic"
8694
cloud_provider = "GCP"
@@ -94,6 +102,7 @@ In this tutorial, you will create a CockroachDB {{ site.data.products.basic }} c
94102
delete_protection = false
95103
}
96104
~~~
105+
- Optionally, include the `version` attribute in the `cockroach` nested block to specify a version of the provider. If you do not include the `version` attribute, Terraform will use the latest provider version.
97106
- Replace `cockroach-basic` with a name for the cluster.
98107
- Set `cloud_provider` to `AWS` `AZURE`, or `GCP`.
99108
- Under `serverless {}`, optionally set values for `resource_unit_limit` and `storage_mib_limits`.
@@ -119,6 +128,14 @@ In this tutorial, you will create a CockroachDB {{ site.data.products.standard }
119128
120129
{% include_cached copy-clipboard.html %}
121130
~~~ hcl
131+
terraform {
132+
required_providers {
133+
cockroach = {
134+
source = "cockroachdb/cockroach"
135+
}
136+
}
137+
}
138+
122139
resource "cockroach_cluster" "standard" {
123140
name = "cockroach-standard"
124141
cloud_provider = "GCP"
@@ -136,6 +153,7 @@ In this tutorial, you will create a CockroachDB {{ site.data.products.standard }
136153
delete_protection = false
137154
}
138155
~~~
156+
- Optionally, include the `version` attribute in the `cockroach` nested block to specify a version of the provider. If you do not include the `version` attribute, Terraform will use the latest provider version.
139157
- Replace `cockroach-standard` with a name for the cluster.
140158
- Set `cloud_provider` to `AWS` `AZURE`, or `GCP`.
141159
- Under `usage_limits`, set `provisioned_virtual_cpus` to the required maximum vCPUs for the cluster.
@@ -159,6 +177,14 @@ In this tutorial, you will create a CockroachDB {{ site.data.products.advanced }
159177
160178
{% include_cached copy-clipboard.html %}
161179
~~~ hcl
180+
terraform {
181+
required_providers {
182+
cockroach = {
183+
source = "cockroachdb/cockroach"
184+
}
185+
}
186+
}
187+
162188
resource "cockroach_cluster" "advanced" {
163189
name = "cockroach-advanced"
164190
cloud_provider = "GCP"
@@ -176,6 +202,7 @@ In this tutorial, you will create a CockroachDB {{ site.data.products.advanced }
176202
delete_protection = true
177203
}
178204
~~~
205+
- Optionally, include the `version` attribute in the `cockroach` nested block to specify a version of the provider. If you do not include the `version` attribute, Terraform will use the latest provider version.
179206
- Replace `cockroach-advanced` with a name for the cluster.
180207
- Set `cloud_provider` to `AWS` `AZURE`, or `GCP`.
181208
- Under `dedicated`, set `storage_gib` to a value large enough to contain the cluster's expected data. Set `num_virtual_cpus` to the number of vCPUs per node.

0 commit comments

Comments
 (0)