Skip to content

Commit 7cded94

Browse files
celialaclaude
andcommitted
clusterversion: move to 26.1 version
This change advances the current release series version on master from 25.4 to 26.1, following the standard M.1 process after forking the release-25.4 branch. This allows the addition of new upgrade gates for version 26.1 and prepares master for the next development cycle. Changes implemented following the M.1 checklist from pkg/clusterversion/README.md: - Added version key constant V26_1 (=Latest) and final version V25_4 - Added start version V26_1_Start (version 25.4-2) with first upgrade - Updated SystemDatabaseSchemaBootstrapVersion to V26_1_Start - Updated roachpb.successorSeries map (25.4 -> 26.1) - Updated pkg/build/version.txt to v26.1.0-alpha.00000000 - Copied scplan rules from current to release_25_4 - Updated package names and version references in scplan rules - Updated rulesForReleases in scplan/plan.go - Regenerated test outputs for scplan and TestDeclarativeRules - Updated releases file (25.4 entries removed as expected) - Regenerated bootstrap test data with updated hash values Note: PreviousRelease is NOT updated in this change - this only happens in M.3 after the first 25.4 RC is published. Release note: None Epic: None 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
1 parent c3b2059 commit 7cded94

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+15139
-504
lines changed

docs/generated/settings/settings-for-tenants.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,4 +426,4 @@ trace.zipkin.collector string the address of a Zipkin instance to receive trace
426426
ui.database_locality_metadata.enabled boolean true if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute application
427427
ui.default_timezone string the default timezone used to format timestamps in the ui application
428428
ui.display_timezone enumeration etc/utc the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the 'ui.default_timezone' setting instead. 'ui.default_timezone' takes precedence over this setting. [etc/utc = 0, america/new_york = 1] application
429-
version version 1000025.3-upgrading-to-1000025.4-step-014 set the active cluster version in the format '<major>.<minor>' application
429+
version version 1000025.4-upgrading-to-1000026.1-step-002 set the active cluster version in the format '<major>.<minor>' application

docs/generated/settings/settings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,6 @@
385385
<tr><td><div id="setting-ui-database-locality-metadata-enabled" class="anchored"><code>ui.database_locality_metadata.enabled</code></div></td><td>boolean</td><td><code>true</code></td><td>if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute</td><td>Basic/Standard/Advanced/Self-Hosted</td></tr>
386386
<tr><td><div id="setting-ui-default-timezone" class="anchored"><code>ui.default_timezone</code></div></td><td>string</td><td><code></code></td><td>the default timezone used to format timestamps in the ui</td><td>Basic/Standard/Advanced/Self-Hosted</td></tr>
387387
<tr><td><div id="setting-ui-display-timezone" class="anchored"><code>ui.display_timezone</code></div></td><td>enumeration</td><td><code>etc/utc</code></td><td>the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the &#39;ui.default_timezone&#39; setting instead. &#39;ui.default_timezone&#39; takes precedence over this setting. [etc/utc = 0, america/new_york = 1]</td><td>Basic/Standard/Advanced/Self-Hosted</td></tr>
388-
<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.3-upgrading-to-1000025.4-step-014</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Basic/Standard/Advanced/Self-Hosted</td></tr>
388+
<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.4-upgrading-to-1000026.1-step-002</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Basic/Standard/Advanced/Self-Hosted</td></tr>
389389
</tbody>
390390
</table>

pkg/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,7 @@ ALL_TESTS = [
610610
"//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
611611
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
612612
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
613+
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4_test",
613614
"//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",
614615
"//pkg/sql/schemachanger/scplan:scplan_test",
615616
"//pkg/sql/schemachanger/screl:screl_test",
@@ -2290,6 +2291,8 @@ GO_TARGETS = [
22902291
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
22912292
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3",
22922293
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
2294+
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4",
2295+
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4_test",
22932296
"//pkg/sql/schemachanger/scplan/internal/rules:rules",
22942297
"//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph",
22952298
"//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",

pkg/build/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v25.4.0-alpha.2
1+
v26.1.0-alpha.00000000

pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ select crdb_internal.get_vmodule()
304304
query T
305305
SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
306306
----
307-
25.4
307+
26.1
308308

309309
query ITTT colnames,rowsort
310310
select node_id, component, field, regexp_replace(regexp_replace(value, '^\d+$', '<port>'), e':\\d+', ':<port>') as value from crdb_internal.node_runtime_info
@@ -392,7 +392,7 @@ select * from crdb_internal.gossip_alerts
392392
query T
393393
SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
394394
----
395-
25.4
395+
26.1
396396

397397
user root
398398

pkg/cli/testdata/declarative-rules/invalid_version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ unsupported version number, the supported versions are:
66
latest
77
1000025.2
88
1000025.3
9+
1000025.4

0 commit comments

Comments
 (0)