Skip to content

Commit b591b58

Browse files
celialaclaude
andcommitted
bootstrap: remove 25.2 bootstrap data
Part of the quarterly M.4 "Bump MinSupported" task as outlined in `pkg/clusterversion/README.md`. This commit removes the bootstrap data for v25.2, which is now below the minimum supported version after bumping MinSupported from v25.2 to v25.3. The bootstrap data files are used to initialize clusters at specific versions. Since clusters can no longer start at v25.2 (it's below MinSupported), these files are no longer needed. Changes: - Removed 25_2_system.keys and 25_2_system.sha256 - Removed 25_2_tenant.keys and 25_2_tenant.sha256 - Removed V25_2 entry from initialValuesFactoryByKey map in initial_values.go - Removed go:embed variables for v25.2 bootstrap data - Updated BUILD.bazel to remove embedsrcs for deleted files Part of #147634 (reference PR for this quarterly task). Release note: None 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
1 parent 4244147 commit b591b58

File tree

6 files changed

+0
-373
lines changed

6 files changed

+0
-373
lines changed

pkg/sql/catalog/bootstrap/BUILD.bazel

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ go_library(
88
"metadata.go",
99
],
1010
embedsrcs = [
11-
"data/25_2_system.keys",
12-
"data/25_2_system.sha256",
13-
"data/25_2_tenant.keys",
14-
"data/25_2_tenant.sha256",
1511
"data/25_3_system.keys",
1612
"data/25_3_system.sha256",
1713
"data/25_3_tenant.keys",

pkg/sql/catalog/bootstrap/data/25_2_system.keys

Lines changed: 0 additions & 212 deletions
This file was deleted.

pkg/sql/catalog/bootstrap/data/25_2_system.sha256

Lines changed: 0 additions & 1 deletion
This file was deleted.

pkg/sql/catalog/bootstrap/data/25_2_tenant.keys

Lines changed: 0 additions & 136 deletions
This file was deleted.

pkg/sql/catalog/bootstrap/data/25_2_tenant.sha256

Lines changed: 0 additions & 1 deletion
This file was deleted.

pkg/sql/catalog/bootstrap/initial_values.go

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,6 @@ type initialValuesFactoryFn = func(opts InitialValuesOpts) (
6666
var initialValuesFactoryByKey = map[clusterversion.Key]initialValuesFactoryFn{
6767
clusterversion.Latest: buildLatestInitialValues,
6868

69-
clusterversion.V25_2: hardCodedInitialValues{
70-
system: v25_2_system_keys,
71-
systemHash: v25_2_system_sha256,
72-
nonSystem: v25_2_tenant_keys,
73-
nonSystemHash: v25_2_tenant_sha256,
74-
}.build,
75-
7669
clusterversion.V25_3: hardCodedInitialValues{
7770
system: v25_3_system_keys,
7871
systemHash: v25_3_system_sha256,
@@ -144,18 +137,6 @@ func (f hardCodedInitialValues) build(
144137
// These files can be auto-generated for the latest version with the
145138
// sql-bootstrap-data CLI tool (see pkg/cmd/sql-bootstrap-data).
146139

147-
//go:embed data/25_2_system.keys
148-
var v25_2_system_keys string
149-
150-
//go:embed data/25_2_system.sha256
151-
var v25_2_system_sha256 string
152-
153-
//go:embed data/25_2_tenant.keys
154-
var v25_2_tenant_keys string
155-
156-
//go:embed data/25_2_tenant.sha256
157-
var v25_2_tenant_sha256 string
158-
159140
//go:embed data/25_3_system.keys
160141
var v25_3_system_keys string
161142

0 commit comments

Comments
 (0)