clusterverion: start 23.1 dev versions

Release note: none.
Epic: none.

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

@@ -300,4 +300,4 @@ trace.jaeger.agent	string		the address of a Jaeger agent to receive traces using
 trace.opentelemetry.collector	string		address of an OpenTelemetry trace collector to receive traces using the otel gRPC protocol, as <host>:<port>. If no port is specified, 4317 will be used.
 trace.span_registry.enabled	boolean	true	if set, ongoing traces can be seen at https://<ui>/#/debug/tracez
 trace.zipkin.collector	string		the address of a Zipkin instance to receive traces, as <host>:<port>. If no port is specified, 9411 will be used.
-version	version	1000022.2	set the active cluster version in the format '<major>.<minor>'
+version	version	1000022.2-2	set the active cluster version in the format '<major>.<minor>'

docs/generated/settings/settings.html

@@ -234,6 +234,6 @@
 <tr><td><code>trace.opentelemetry.collector</code></td><td>string</td><td><code></code></td><td>address of an OpenTelemetry trace collector to receive traces using the otel gRPC protocol, as <host>:<port>. If no port is specified, 4317 will be used.</td></tr>
 <tr><td><code>trace.span_registry.enabled</code></td><td>boolean</td><td><code>true</code></td><td>if set, ongoing traces can be seen at https://<ui>/#/debug/tracez</td></tr>
 <tr><td><code>trace.zipkin.collector</code></td><td>string</td><td><code></code></td><td>the address of a Zipkin instance to receive traces, as <host>:<port>. If no port is specified, 9411 will be used.</td></tr>
-<tr><td><code>version</code></td><td>version</td><td><code>1000022.2</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
+<tr><td><code>version</code></td><td>version</td><td><code>1000022.2-2</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
 </tbody>
 </table>

pkg/clusterversion/cockroach_versions.go

@@ -310,6 +310,10 @@ const (
 	// V22_2 is CockroachDB v22.2. It's used for all v22.2.x patch releases.
 	V22_2
 
+	// V23_1_Start demarcates the start of cluster versions stepped through during
+	// the process of upgrading from 22.2 to 23.1.
+	V23_1Start
+
 	// *************************************************
 	// Step (1): Add new versions here.
 	// Do not add new versions to a patch release.
@@ -504,6 +508,10 @@ var rawVersionsSingleton = keyedVersions{
 		Key:     V22_2,
 		Version: roachpb.Version{Major: 22, Minor: 2, Internal: 0},
 	},
+	{
+		Key:     V23_1Start,
+		Version: roachpb.Version{Major: 22, Minor: 2, Internal: 2},
+	},
 	// *************************************************
 	// Step (2): Add new versions here.
 	// Do not add new versions to a patch release.
@@ -519,7 +527,7 @@ const (
 	// finalVersion should be set on a release branch to the minted final cluster
 	// version key, e.g. to V22_2 on the release-22.2 branch once it is minted.
 	// Setting it has the effect of ensuring no versions are subsequently added.
-	finalVersion = V22_2
+	finalVersion = invalidVersionKey
 )
 
 // devVersionsAbove is the version key above which all versions are offset to be