clusterversion: introduce 22.1 development versions

Release justification: Non-production code change. Release note: None
cockroachdb · Oct 1, 2021 · 6ee0d29 · 6ee0d29
1 parent 5f53feb
commit 6ee0d29
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/docs/generated/settings/settings-for-tenants.txt b/docs/generated/settings/settings-for-tenants.txt
@@ -165,4 +165,4 @@ trace.debug.enable boolean false if set, traces for recent requests can be seen
 trace.jaeger.agent string the address of a Jaeger agent to receive traces using the Jaeger UDP Thrift protocol, as <host>:<port>. If no port is specified, 6381 will be used.
 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.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 21.2 set the active cluster version in the format '<major>.<minor>'
+version version 21.2-1 set the active cluster version in the format '<major>.<minor>'
diff --git a/docs/generated/settings/settings.html b/docs/generated/settings/settings.html
@@ -170,6 +170,6 @@
 <tr><td><code>trace.jaeger.agent</code></td><td>string</td><td><code></code></td><td>the address of a Jaeger agent to receive traces using the Jaeger UDP Thrift protocol, as <host>:<port>. If no port is specified, 6381 will be used.</td></tr>
 <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.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>21.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>21.2-1</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
 </tbody>
 </table>
diff --git a/pkg/clusterversion/cockroach_versions.go b/pkg/clusterversion/cockroach_versions.go
@@ -292,6 +292,11 @@ const (
  // V21_2 is CockroachDB v21.2. It's used for all v21.2.x patch releases.
  V21_2
 
+ // v22.1 versions.
+ //
+ // Start22_1 demarcates work towards CockroachDB v22.1.
+ Start22_1
+
  // *************************************************
  // Step (1): Add new versions here.
  // Do not add new versions to a patch release.
@@ -494,6 +499,13 @@ var versionsSingleton = keyedVersions{
  Key: V21_2,
  Version: roachpb.Version{Major: 21, Minor: 2},
  },
+
+ // v22.1 versions.
+ {
+ Key: Start22_1,
+ Version: roachpb.Version{Major: 22, Minor: 1, Internal: 100},
+ },
+
  // *************************************************
  // Step (2): Add new versions here.
  // Do not add new versions to a patch release.
@@ -509,7 +521,7 @@ var (
  // version than binaryMinSupportedVersion, then the binary will exit with
  // an error. This typically trails the current release by one (see top-level
  // comment).
- binaryMinSupportedVersion = ByKey(V21_1)
+ binaryMinSupportedVersion = ByKey(V21_2)
 
  // binaryVersion is the version of this binary.
  //