clusterversion: remove obs TODO_Delete_V25_2 versions

Resolves: #147776
Release note: None

Author: kyle-a-wong

pkg/clusterversion/cockroach_versions.go

@@ -205,10 +205,6 @@ const (
 
 	TODO_Delete_V25_2_Start
 
-	TODO_Delete_V25_2_AddSqlActivityFlushJob
-
-	TODO_Delete_V25_2_SetUiDefaultTimezoneSetting
-
 	// V25_2 is CockroachDB v25.2. It's used for all v25.2.x patch releases.
 	V25_2
 
@@ -277,9 +273,7 @@ var versionTable = [numKeys]roachpb.Version{
 	V25_1: {Major: 25, Minor: 1, Internal: 0},
 
 	// v25.2 versions. Internal versions must be even.
-	TODO_Delete_V25_2_Start:                       {Major: 25, Minor: 1, Internal: 2},
-	TODO_Delete_V25_2_AddSqlActivityFlushJob:      {Major: 25, Minor: 1, Internal: 4},
-	TODO_Delete_V25_2_SetUiDefaultTimezoneSetting: {Major: 25, Minor: 1, Internal: 6},
+	TODO_Delete_V25_2_Start: {Major: 25, Minor: 1, Internal: 2},
 
 	V25_2: {Major: 25, Minor: 2, Internal: 0},
 

pkg/ui/BUILD.bazel

@@ -21,6 +21,7 @@ go_library(
         "//pkg/server/serverpb",
         "//pkg/settings",
         "//pkg/settings/cluster",
+        "//pkg/ui/settings",
         "//pkg/util/httputil",
         "//pkg/util/log",
         "//pkg/util/timeutil",

pkg/ui/ui.go

@@ -25,6 +25,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/server/serverpb"
 	"github.com/cockroachdb/cockroach/pkg/settings"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
+	_ "github.com/cockroachdb/cockroach/pkg/ui/settings" // Import the settings package to register UI-related settings for doc generation.
 	"github.com/cockroachdb/cockroach/pkg/util/httputil"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"

pkg/upgrade/upgrades/BUILD.bazel

@@ -17,8 +17,6 @@ go_library(
         "schema_changes.go",
         "upgrades.go",
         "v25_1_prepared_transactions_table.go",
-        "v25_2_add_sql_activity_flush_job.go",
-        "v25_2_set_ui_default_timezone.go",
         "v25_3_add_event_log_column_and_index.go",
         "v25_3_add_hot_range_logger_job.go",
         "v25_3_add_users_last_login_time_column.go",
@@ -55,7 +53,6 @@ go_library(
         "//pkg/sql/sessiondata",
         "//pkg/sql/sqlstats/sqlactivityjob",
         "//pkg/sql/tablemetadatacache",
-        "//pkg/ui/settings",
         "//pkg/upgrade",
         "//pkg/upgrade/upgradebase",
         "//pkg/util/envutil",
@@ -87,7 +84,6 @@ go_test(
         "schema_changes_helpers_test.go",
         "upgrades_test.go",
         "v25_1_prepared_transactions_table_test.go",
-        "v25_2_set_ui_default_timezone_test.go",
         "v25_3_add_event_log_column_and_index_test.go",
         "v25_3_add_hot_range_logger_job_test.go",
         "v25_3_add_users_last_login_time_column_test.go",
@@ -135,7 +131,6 @@ go_test(
         "//pkg/testutils/skip",
         "//pkg/testutils/sqlutils",
         "//pkg/testutils/testcluster",
-        "//pkg/ui/settings",
         "//pkg/upgrade",
         "//pkg/upgrade/upgradebase",
         "//pkg/util/ctxgroup",
@@ -148,6 +143,5 @@ go_test(
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_stretchr_testify//assert",
         "@com_github_stretchr_testify//require",
-        "@org_golang_x_exp//maps",
     ],
 )

pkg/upgrade/upgrades/upgrades.go

@@ -71,22 +71,6 @@ var upgrades = []upgradebase.Upgrade{
 
 	newFirstUpgrade(clusterversion.TODO_Delete_V25_2_Start.Version()),
 
-	upgrade.NewTenantUpgrade(
-		"add new sql activity flush job",
-		clusterversion.TODO_Delete_V25_2_AddSqlActivityFlushJob.Version(),
-		upgrade.NoPrecondition,
-		addSqlActivityFlushJob,
-		upgrade.RestoreActionNotRequired("cluster restore does not restore this job"),
-	),
-
-	upgrade.NewTenantUpgrade(
-		"set new ui.default_timezone setting to ui.display_timezone value",
-		clusterversion.TODO_Delete_V25_2_SetUiDefaultTimezoneSetting.Version(),
-		upgrade.NoPrecondition,
-		setUiDefaultTimezone,
-		upgrade.RestoreActionNotRequired("cluster restore does not restore this setting"),
-	),
-
 	newFirstUpgrade(clusterversion.V25_3_Start.Version()),
 
 	upgrade.NewTenantUpgrade(