From ba743aacbaf2f8b5de7e06c4b1ae889f9a585176 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Mar 2025 08:49:11 -0500
Subject: [PATCH] Update supported CRDB versions. (#1086)

Co-authored-by: CRL Release bot <teamcity@cockroachlabs.com>
---
 config/manager/patches/image.yaml             | 14 +++++++++++++
 ...kroach-operator.clusterserviceversion.yaml | 14 +++++++++++++
 .../manifests/patches/deployment_patch.yaml   | 14 +++++++++++++
 config/samples/crdb-tls-example.yaml          |  2 +-
 crdb-versions.yaml                            | 21 +++++++++++++++++++
 examples/client-secure-operator.yaml          |  2 +-
 examples/example.yaml                         |  4 ++--
 examples/smoketest.yaml                       |  2 +-
 install/operator.yaml                         | 14 +++++++++++++
 9 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml
index 1f0076435..771cf79cd 100644
--- a/config/manager/patches/image.yaml
+++ b/config/manager/patches/image.yaml
@@ -270,6 +270,8 @@ spec:
               value: cockroachdb/cockroach:v23.2.17
             - name: RELATED_IMAGE_COCKROACH_v23_2_19
               value: cockroachdb/cockroach:v23.2.19
+            - name: RELATED_IMAGE_COCKROACH_v23_2_20
+              value: cockroachdb/cockroach:v23.2.20
             - name: RELATED_IMAGE_COCKROACH_v24_1_0
               value: cockroachdb/cockroach:v24.1.0
             - name: RELATED_IMAGE_COCKROACH_v24_1_1
@@ -292,6 +294,10 @@ spec:
               value: cockroachdb/cockroach:v24.1.10
             - name: RELATED_IMAGE_COCKROACH_v24_1_11
               value: cockroachdb/cockroach:v24.1.11
+            - name: RELATED_IMAGE_COCKROACH_v24_1_12
+              value: cockroachdb/cockroach:v24.1.12
+            - name: RELATED_IMAGE_COCKROACH_v24_1_13
+              value: cockroachdb/cockroach:v24.1.13
             - name: RELATED_IMAGE_COCKROACH_v24_2_0
               value: cockroachdb/cockroach:v24.2.0
             - name: RELATED_IMAGE_COCKROACH_v24_2_2
@@ -308,6 +314,8 @@ spec:
               value: cockroachdb/cockroach:v24.2.8
             - name: RELATED_IMAGE_COCKROACH_v24_2_9
               value: cockroachdb/cockroach:v24.2.9
+            - name: RELATED_IMAGE_COCKROACH_v24_2_10
+              value: cockroachdb/cockroach:v24.2.10
             - name: RELATED_IMAGE_COCKROACH_v24_3_0
               value: cockroachdb/cockroach:v24.3.0
             - name: RELATED_IMAGE_COCKROACH_v24_3_1
@@ -316,3 +324,9 @@ spec:
               value: cockroachdb/cockroach:v24.3.3
             - name: RELATED_IMAGE_COCKROACH_v24_3_4
               value: cockroachdb/cockroach:v24.3.4
+            - name: RELATED_IMAGE_COCKROACH_v24_3_5
+              value: cockroachdb/cockroach:v24.3.5
+            - name: RELATED_IMAGE_COCKROACH_v24_3_6
+              value: cockroachdb/cockroach:v24.3.6
+            - name: RELATED_IMAGE_COCKROACH_v25_1_0
+              value: cockroachdb/cockroach:v25.1.0
diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
index 8c5b23dbf..53e0c961e 100644
--- a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
@@ -443,6 +443,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v23_2_17
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1558a1f5eab79f1a8c6c85d81740cc539dc23025ea457c0019d93a72dc05d57a
     name: RELATED_IMAGE_COCKROACH_v23_2_19
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:58de9d0b2ce005c7ad3e99152100e59b7677398557028a7a59e56e669fabb81c
+    name: RELATED_IMAGE_COCKROACH_v23_2_20
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
     name: RELATED_IMAGE_COCKROACH_v24_1_0
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1374cbdc4ecf38e4b4226328f532e830b8932b34d9449bf2fbb36e60d0310521
@@ -465,6 +467,10 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v24_1_10
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e82684b828256b3c2814930210031b3b70bc818514d4359a25f87ffdbf22be6e
     name: RELATED_IMAGE_COCKROACH_v24_1_11
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e151bded670f4cbd165a8ef864324805667d3e84ce3ace0cdf8f9aad087fccf1
+    name: RELATED_IMAGE_COCKROACH_v24_1_12
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2171e1c75d0c665fe33e1ea334e605604c51de6dbc22d88a3a0ac604259c448f
+    name: RELATED_IMAGE_COCKROACH_v24_1_13
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024
     name: RELATED_IMAGE_COCKROACH_v24_2_0
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:08cec123813304ab03bd66d72a09949667a874a42320bedafda391ebcdb2e56c
@@ -481,6 +487,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v24_2_8
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cf001173bbf00cdf443b8d64a3ad724389f1cf83e3628d0b609019c8cddad35a
     name: RELATED_IMAGE_COCKROACH_v24_2_9
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c2a62179e8ca293d7e30b9da599e48795345cf07a72abd3a83063107b53b03cc
+    name: RELATED_IMAGE_COCKROACH_v24_2_10
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b06bd7f3802e8fa2af14bb0b07804cad4cc0fbbc97da18d09a9106bf074ed6d8
     name: RELATED_IMAGE_COCKROACH_v24_3_0
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:740ba10f1ef0a6c5fa6ad31ab18855fc75f8e024ce4c23b0676c5a9c5b62cd75
@@ -489,6 +497,12 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v24_3_3
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:858dc82977b3c9e989a3a20626671b0c67c834c97132094a9212bb227ab55929
     name: RELATED_IMAGE_COCKROACH_v24_3_4
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7481c0cf3b579c8d98d94d4aa0334ca94bf2ccfcd25ad70b57c42b22bbf4bcee
+    name: RELATED_IMAGE_COCKROACH_v24_3_5
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8a70ba12f610ac0e62066e417a0833bc1d01e91ac99d0dd794a2c0cd2a350164
+    name: RELATED_IMAGE_COCKROACH_v24_3_6
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
+    name: RELATED_IMAGE_COCKROACH_v25_1_0
   - image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
     name: RELATED_IMAGE_COCKROACH_OPERATOR
   version: 0.0.0
diff --git a/config/manifests/patches/deployment_patch.yaml b/config/manifests/patches/deployment_patch.yaml
index 48dc734de..2ea34f520 100644
--- a/config/manifests/patches/deployment_patch.yaml
+++ b/config/manifests/patches/deployment_patch.yaml
@@ -279,6 +279,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b77b80eed7ce149d2a3f228e5f188e76d73f32bc50ecde20bba9cfa7bdc4714c
             - name: RELATED_IMAGE_COCKROACH_v23_2_19
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1558a1f5eab79f1a8c6c85d81740cc539dc23025ea457c0019d93a72dc05d57a
+            - name: RELATED_IMAGE_COCKROACH_v23_2_20
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:58de9d0b2ce005c7ad3e99152100e59b7677398557028a7a59e56e669fabb81c
             - name: RELATED_IMAGE_COCKROACH_v24_1_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
             - name: RELATED_IMAGE_COCKROACH_v24_1_1
@@ -301,6 +303,10 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:743cda1eda6e273c798e3405a9a97e07dd6aa5ad4d5a52789be3b0f39a32a039
             - name: RELATED_IMAGE_COCKROACH_v24_1_11
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e82684b828256b3c2814930210031b3b70bc818514d4359a25f87ffdbf22be6e
+            - name: RELATED_IMAGE_COCKROACH_v24_1_12
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e151bded670f4cbd165a8ef864324805667d3e84ce3ace0cdf8f9aad087fccf1
+            - name: RELATED_IMAGE_COCKROACH_v24_1_13
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2171e1c75d0c665fe33e1ea334e605604c51de6dbc22d88a3a0ac604259c448f
             - name: RELATED_IMAGE_COCKROACH_v24_2_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024
             - name: RELATED_IMAGE_COCKROACH_v24_2_2
@@ -317,6 +323,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:db07461824e73410456ef540b0bce3c7fe550aa67a73d6174300ca74b8f75276
             - name: RELATED_IMAGE_COCKROACH_v24_2_9
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cf001173bbf00cdf443b8d64a3ad724389f1cf83e3628d0b609019c8cddad35a
+            - name: RELATED_IMAGE_COCKROACH_v24_2_10
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c2a62179e8ca293d7e30b9da599e48795345cf07a72abd3a83063107b53b03cc
             - name: RELATED_IMAGE_COCKROACH_v24_3_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b06bd7f3802e8fa2af14bb0b07804cad4cc0fbbc97da18d09a9106bf074ed6d8
             - name: RELATED_IMAGE_COCKROACH_v24_3_1
@@ -325,4 +333,10 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f045fe5037d44aab1a0b2209241b3931ec7cb9897cb3c6a96a9f8d5280e55dd2
             - name: RELATED_IMAGE_COCKROACH_v24_3_4
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:858dc82977b3c9e989a3a20626671b0c67c834c97132094a9212bb227ab55929
+            - name: RELATED_IMAGE_COCKROACH_v24_3_5
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7481c0cf3b579c8d98d94d4aa0334ca94bf2ccfcd25ad70b57c42b22bbf4bcee
+            - name: RELATED_IMAGE_COCKROACH_v24_3_6
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8a70ba12f610ac0e62066e417a0833bc1d01e91ac99d0dd794a2c0cd2a350164
+            - name: RELATED_IMAGE_COCKROACH_v25_1_0
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
           image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
diff --git a/config/samples/crdb-tls-example.yaml b/config/samples/crdb-tls-example.yaml
index b5f54a52b..50b5dc0d6 100644
--- a/config/samples/crdb-tls-example.yaml
+++ b/config/samples/crdb-tls-example.yaml
@@ -19,7 +19,7 @@ kind: CrdbCluster
 metadata:
   name: crdb-tls-example
 spec:
-  cockroachDBVersion: v24.3.4
+  cockroachDBVersion: v25.1.0
   dataStore:
     pvc:
       spec:
diff --git a/crdb-versions.yaml b/crdb-versions.yaml
index 31eff1a75..e0b423e93 100644
--- a/crdb-versions.yaml
+++ b/crdb-versions.yaml
@@ -388,6 +388,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v23.2.19
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1558a1f5eab79f1a8c6c85d81740cc539dc23025ea457c0019d93a72dc05d57a
   tag: v23.2.19
+- image: cockroachdb/cockroach:v23.2.20
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:58de9d0b2ce005c7ad3e99152100e59b7677398557028a7a59e56e669fabb81c
+  tag: v23.2.20
 - image: cockroachdb/cockroach:v24.1.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
   tag: v24.1.0
@@ -421,6 +424,12 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v24.1.11
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e82684b828256b3c2814930210031b3b70bc818514d4359a25f87ffdbf22be6e
   tag: v24.1.11
+- image: cockroachdb/cockroach:v24.1.12
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e151bded670f4cbd165a8ef864324805667d3e84ce3ace0cdf8f9aad087fccf1
+  tag: v24.1.12
+- image: cockroachdb/cockroach:v24.1.13
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2171e1c75d0c665fe33e1ea334e605604c51de6dbc22d88a3a0ac604259c448f
+  tag: v24.1.13
 - image: cockroachdb/cockroach:v24.2.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024
   tag: v24.2.0
@@ -445,6 +454,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v24.2.9
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cf001173bbf00cdf443b8d64a3ad724389f1cf83e3628d0b609019c8cddad35a
   tag: v24.2.9
+- image: cockroachdb/cockroach:v24.2.10
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c2a62179e8ca293d7e30b9da599e48795345cf07a72abd3a83063107b53b03cc
+  tag: v24.2.10
 - image: cockroachdb/cockroach:v24.3.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b06bd7f3802e8fa2af14bb0b07804cad4cc0fbbc97da18d09a9106bf074ed6d8
   tag: v24.3.0
@@ -457,3 +469,12 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v24.3.4
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:858dc82977b3c9e989a3a20626671b0c67c834c97132094a9212bb227ab55929
   tag: v24.3.4
+- image: cockroachdb/cockroach:v24.3.5
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7481c0cf3b579c8d98d94d4aa0334ca94bf2ccfcd25ad70b57c42b22bbf4bcee
+  tag: v24.3.5
+- image: cockroachdb/cockroach:v24.3.6
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8a70ba12f610ac0e62066e417a0833bc1d01e91ac99d0dd794a2c0cd2a350164
+  tag: v24.3.6
+- image: cockroachdb/cockroach:v25.1.0
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
+  tag: v25.1.0
diff --git a/examples/client-secure-operator.yaml b/examples/client-secure-operator.yaml
index 9f8a8458c..bcbfa8400 100644
--- a/examples/client-secure-operator.yaml
+++ b/examples/client-secure-operator.yaml
@@ -23,7 +23,7 @@ spec:
   serviceAccountName: cockroachdb-sa
   containers:
   - name: cockroachdb-client-secure
-    image: cockroachdb/cockroach:v24.3.4
+    image: cockroachdb/cockroach:v25.1.0
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs
diff --git a/examples/example.yaml b/examples/example.yaml
index 56e6a92e6..3fad310de 100644
--- a/examples/example.yaml
+++ b/examples/example.yaml
@@ -40,9 +40,9 @@ spec:
       memory: 8Gi
   tlsEnabled: true
 # You can set either a version of the db or a specific image name
-# cockroachDBVersion: v24.3.4
+# cockroachDBVersion: v25.1.0
   image:
-    name: cockroachdb/cockroach:v24.3.4
+    name: cockroachdb/cockroach:v25.1.0
   # nodes refers to the number of crdb pods that are created
   # via the statefulset
   nodes: 3
diff --git a/examples/smoketest.yaml b/examples/smoketest.yaml
index 36e0cc7e0..9ed8acba5 100644
--- a/examples/smoketest.yaml
+++ b/examples/smoketest.yaml
@@ -39,5 +39,5 @@ spec:
       memory: 300Mi
   tlsEnabled: true
   image:
-    name: cockroachdb/cockroach:v24.3.4
+    name: cockroachdb/cockroach:v25.1.0
   nodes: 3
diff --git a/install/operator.yaml b/install/operator.yaml
index 77b0f5269..02dd5e9c0 100644
--- a/install/operator.yaml
+++ b/install/operator.yaml
@@ -629,6 +629,8 @@ spec:
           value: cockroachdb/cockroach:v23.2.17
         - name: RELATED_IMAGE_COCKROACH_v23_2_19
           value: cockroachdb/cockroach:v23.2.19
+        - name: RELATED_IMAGE_COCKROACH_v23_2_20
+          value: cockroachdb/cockroach:v23.2.20
         - name: RELATED_IMAGE_COCKROACH_v24_1_0
           value: cockroachdb/cockroach:v24.1.0
         - name: RELATED_IMAGE_COCKROACH_v24_1_1
@@ -651,6 +653,10 @@ spec:
           value: cockroachdb/cockroach:v24.1.10
         - name: RELATED_IMAGE_COCKROACH_v24_1_11
           value: cockroachdb/cockroach:v24.1.11
+        - name: RELATED_IMAGE_COCKROACH_v24_1_12
+          value: cockroachdb/cockroach:v24.1.12
+        - name: RELATED_IMAGE_COCKROACH_v24_1_13
+          value: cockroachdb/cockroach:v24.1.13
         - name: RELATED_IMAGE_COCKROACH_v24_2_0
           value: cockroachdb/cockroach:v24.2.0
         - name: RELATED_IMAGE_COCKROACH_v24_2_2
@@ -667,6 +673,8 @@ spec:
           value: cockroachdb/cockroach:v24.2.8
         - name: RELATED_IMAGE_COCKROACH_v24_2_9
           value: cockroachdb/cockroach:v24.2.9
+        - name: RELATED_IMAGE_COCKROACH_v24_2_10
+          value: cockroachdb/cockroach:v24.2.10
         - name: RELATED_IMAGE_COCKROACH_v24_3_0
           value: cockroachdb/cockroach:v24.3.0
         - name: RELATED_IMAGE_COCKROACH_v24_3_1
@@ -675,6 +683,12 @@ spec:
           value: cockroachdb/cockroach:v24.3.3
         - name: RELATED_IMAGE_COCKROACH_v24_3_4
           value: cockroachdb/cockroach:v24.3.4
+        - name: RELATED_IMAGE_COCKROACH_v24_3_5
+          value: cockroachdb/cockroach:v24.3.5
+        - name: RELATED_IMAGE_COCKROACH_v24_3_6
+          value: cockroachdb/cockroach:v24.3.6
+        - name: RELATED_IMAGE_COCKROACH_v25_1_0
+          value: cockroachdb/cockroach:v25.1.0
         - name: OPERATOR_NAME
           value: cockroachdb
         - name: POD_NAME