From 7bdc998d17f4d365007ef23d1bf1540eb5db3ed5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 14:49:03 -0500
Subject: [PATCH] Update supported CRDB versions. (#1073)

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

diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml
index be7930a4a..a13860f43 100644
--- a/config/manager/patches/image.yaml
+++ b/config/manager/patches/image.yaml
@@ -232,6 +232,8 @@ spec:
               value: cockroachdb/cockroach:v23.1.28
             - name: RELATED_IMAGE_COCKROACH_v23_1_29
               value: cockroachdb/cockroach:v23.1.29
+            - name: RELATED_IMAGE_COCKROACH_v23_1_30
+              value: cockroachdb/cockroach:v23.1.30
             - name: RELATED_IMAGE_COCKROACH_v23_2_0
               value: cockroachdb/cockroach:v23.2.0
             - name: RELATED_IMAGE_COCKROACH_v23_2_1
@@ -264,6 +266,8 @@ spec:
               value: cockroachdb/cockroach:v23.2.15
             - name: RELATED_IMAGE_COCKROACH_v23_2_16
               value: cockroachdb/cockroach:v23.2.16
+            - name: RELATED_IMAGE_COCKROACH_v23_2_17
+              value: cockroachdb/cockroach:v23.2.17
             - name: RELATED_IMAGE_COCKROACH_v24_1_0
               value: cockroachdb/cockroach:v24.1.0
             - name: RELATED_IMAGE_COCKROACH_v24_1_1
@@ -280,6 +284,8 @@ spec:
               value: cockroachdb/cockroach:v24.1.6
             - name: RELATED_IMAGE_COCKROACH_v24_1_7
               value: cockroachdb/cockroach:v24.1.7
+            - name: RELATED_IMAGE_COCKROACH_v24_1_8
+              value: cockroachdb/cockroach:v24.1.8
             - name: RELATED_IMAGE_COCKROACH_v24_2_0
               value: cockroachdb/cockroach:v24.2.0
             - name: RELATED_IMAGE_COCKROACH_v24_2_2
@@ -290,5 +296,9 @@ spec:
               value: cockroachdb/cockroach:v24.2.4
             - name: RELATED_IMAGE_COCKROACH_v24_2_5
               value: cockroachdb/cockroach:v24.2.5
+            - name: RELATED_IMAGE_COCKROACH_v24_2_6
+              value: cockroachdb/cockroach:v24.2.6
             - name: RELATED_IMAGE_COCKROACH_v24_3_0
               value: cockroachdb/cockroach:v24.3.0
+            - name: RELATED_IMAGE_COCKROACH_v24_3_1
+              value: cockroachdb/cockroach:v24.3.1
diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
index f708a8e4c..80d5dcf43 100644
--- a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
@@ -405,6 +405,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v23_1_28
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:91f7e59f9e35a0395756eafed906963c535e886125294d671d930ce959a8f511
     name: RELATED_IMAGE_COCKROACH_v23_1_29
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6a2ee8d62c586eb74ebbef6bef256e06e1ba5cb51c1ae55b1654adafc2ca8859
+    name: RELATED_IMAGE_COCKROACH_v23_1_30
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:56109e57ee0379cf48644bcf8226a9238e01139cacc5499002c99f973f121911
     name: RELATED_IMAGE_COCKROACH_v23_2_0
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:4e5f7df1dc1e1db398c36d590431e7e5782897b209972d8e9e4671971c10d1b6
@@ -437,6 +439,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v23_2_15
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cf7d3bea47638b763b312c7c11ca034a7ac62d993d75a13edceec74799b97e52
     name: RELATED_IMAGE_COCKROACH_v23_2_16
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b77b80eed7ce149d2a3f228e5f188e76d73f32bc50ecde20bba9cfa7bdc4714c
+    name: RELATED_IMAGE_COCKROACH_v23_2_17
   - 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
@@ -453,6 +457,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v24_1_6
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:468b0a40a33be1dd5a2a89ce745d7e9012bc7371f2f01cc0f8f12c0ac887db43
     name: RELATED_IMAGE_COCKROACH_v24_1_7
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1f6b1ec92251397dbcf7ed4a82f1f05619d64676aae2717f4eff1c33e4c2c27a
+    name: RELATED_IMAGE_COCKROACH_v24_1_8
   - 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
@@ -463,8 +469,12 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v24_2_4
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d4f753151af4c3d3f5a1df9014461316249a6d0621b8fba5c4430307b3355251
     name: RELATED_IMAGE_COCKROACH_v24_2_5
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5d6901b6b6fd6594d42bfc1842d050c7cffcb0867a5591a67469f0f860b1f21b
+    name: RELATED_IMAGE_COCKROACH_v24_2_6
   - 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
+    name: RELATED_IMAGE_COCKROACH_v24_3_1
   - 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 00054cff5..2a60d1d00 100644
--- a/config/manifests/patches/deployment_patch.yaml
+++ b/config/manifests/patches/deployment_patch.yaml
@@ -241,6 +241,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8737b67b91983817e3e4ff3f47f0b070bd36162d309b60993529426c6979cb24
             - name: RELATED_IMAGE_COCKROACH_v23_1_29
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:91f7e59f9e35a0395756eafed906963c535e886125294d671d930ce959a8f511
+            - name: RELATED_IMAGE_COCKROACH_v23_1_30
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6a2ee8d62c586eb74ebbef6bef256e06e1ba5cb51c1ae55b1654adafc2ca8859
             - name: RELATED_IMAGE_COCKROACH_v23_2_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:56109e57ee0379cf48644bcf8226a9238e01139cacc5499002c99f973f121911
             - name: RELATED_IMAGE_COCKROACH_v23_2_1
@@ -273,6 +275,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f29c31bb267451b389608af3e8a4a28d6ca0691e67b77e8f57bb5e461b064893
             - name: RELATED_IMAGE_COCKROACH_v23_2_16
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cf7d3bea47638b763b312c7c11ca034a7ac62d993d75a13edceec74799b97e52
+            - name: RELATED_IMAGE_COCKROACH_v23_2_17
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b77b80eed7ce149d2a3f228e5f188e76d73f32bc50ecde20bba9cfa7bdc4714c
             - name: RELATED_IMAGE_COCKROACH_v24_1_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
             - name: RELATED_IMAGE_COCKROACH_v24_1_1
@@ -289,6 +293,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:72ea3d0ef72972dba93362dc31366c5946a9898f5c16780b877316a97068ef8f
             - name: RELATED_IMAGE_COCKROACH_v24_1_7
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:468b0a40a33be1dd5a2a89ce745d7e9012bc7371f2f01cc0f8f12c0ac887db43
+            - name: RELATED_IMAGE_COCKROACH_v24_1_8
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1f6b1ec92251397dbcf7ed4a82f1f05619d64676aae2717f4eff1c33e4c2c27a
             - name: RELATED_IMAGE_COCKROACH_v24_2_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024
             - name: RELATED_IMAGE_COCKROACH_v24_2_2
@@ -299,6 +305,10 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:226d7f1c3f0d70ac6532ad9490bebcdef44a40959b6aa7c11b0f2d1383a46217
             - name: RELATED_IMAGE_COCKROACH_v24_2_5
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d4f753151af4c3d3f5a1df9014461316249a6d0621b8fba5c4430307b3355251
+            - name: RELATED_IMAGE_COCKROACH_v24_2_6
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5d6901b6b6fd6594d42bfc1842d050c7cffcb0867a5591a67469f0f860b1f21b
             - name: RELATED_IMAGE_COCKROACH_v24_3_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b06bd7f3802e8fa2af14bb0b07804cad4cc0fbbc97da18d09a9106bf074ed6d8
+            - name: RELATED_IMAGE_COCKROACH_v24_3_1
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:740ba10f1ef0a6c5fa6ad31ab18855fc75f8e024ce4c23b0676c5a9c5b62cd75
           image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
diff --git a/config/samples/crdb-tls-example.yaml b/config/samples/crdb-tls-example.yaml
index 3ee8523d3..6a2279ea1 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.0
+  cockroachDBVersion: v24.3.1
   dataStore:
     pvc:
       spec:
diff --git a/crdb-versions.yaml b/crdb-versions.yaml
index 1001d169c..2f93fa4cb 100644
--- a/crdb-versions.yaml
+++ b/crdb-versions.yaml
@@ -331,6 +331,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v23.1.29
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:91f7e59f9e35a0395756eafed906963c535e886125294d671d930ce959a8f511
   tag: v23.1.29
+- image: cockroachdb/cockroach:v23.1.30
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6a2ee8d62c586eb74ebbef6bef256e06e1ba5cb51c1ae55b1654adafc2ca8859
+  tag: v23.1.30
 - image: cockroachdb/cockroach:v23.2.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:56109e57ee0379cf48644bcf8226a9238e01139cacc5499002c99f973f121911
   tag: v23.2.0
@@ -379,6 +382,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v23.2.16
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cf7d3bea47638b763b312c7c11ca034a7ac62d993d75a13edceec74799b97e52
   tag: v23.2.16
+- image: cockroachdb/cockroach:v23.2.17
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b77b80eed7ce149d2a3f228e5f188e76d73f32bc50ecde20bba9cfa7bdc4714c
+  tag: v23.2.17
 - image: cockroachdb/cockroach:v24.1.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
   tag: v24.1.0
@@ -403,6 +409,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v24.1.7
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:468b0a40a33be1dd5a2a89ce745d7e9012bc7371f2f01cc0f8f12c0ac887db43
   tag: v24.1.7
+- image: cockroachdb/cockroach:v24.1.8
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1f6b1ec92251397dbcf7ed4a82f1f05619d64676aae2717f4eff1c33e4c2c27a
+  tag: v24.1.8
 - image: cockroachdb/cockroach:v24.2.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024
   tag: v24.2.0
@@ -418,6 +427,12 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v24.2.5
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d4f753151af4c3d3f5a1df9014461316249a6d0621b8fba5c4430307b3355251
   tag: v24.2.5
+- image: cockroachdb/cockroach:v24.2.6
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5d6901b6b6fd6594d42bfc1842d050c7cffcb0867a5591a67469f0f860b1f21b
+  tag: v24.2.6
 - image: cockroachdb/cockroach:v24.3.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b06bd7f3802e8fa2af14bb0b07804cad4cc0fbbc97da18d09a9106bf074ed6d8
   tag: v24.3.0
+- image: cockroachdb/cockroach:v24.3.1
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:740ba10f1ef0a6c5fa6ad31ab18855fc75f8e024ce4c23b0676c5a9c5b62cd75
+  tag: v24.3.1
diff --git a/examples/client-secure-operator.yaml b/examples/client-secure-operator.yaml
index ed86429cb..76471d8cb 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.0
+    image: cockroachdb/cockroach:v24.3.1
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs
diff --git a/examples/example.yaml b/examples/example.yaml
index daede638f..8e56f35ef 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.0
+# cockroachDBVersion: v24.3.1
   image:
-    name: cockroachdb/cockroach:v24.3.0
+    name: cockroachdb/cockroach:v24.3.1
   # 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 f4dd77eea..60dc1b319 100644
--- a/examples/smoketest.yaml
+++ b/examples/smoketest.yaml
@@ -39,5 +39,5 @@ spec:
       memory: 300Mi
   tlsEnabled: true
   image:
-    name: cockroachdb/cockroach:v24.3.0
+    name: cockroachdb/cockroach:v24.3.1
   nodes: 3
diff --git a/install/operator.yaml b/install/operator.yaml
index 8de72f8b3..9cf049a54 100644
--- a/install/operator.yaml
+++ b/install/operator.yaml
@@ -591,6 +591,8 @@ spec:
           value: cockroachdb/cockroach:v23.1.28
         - name: RELATED_IMAGE_COCKROACH_v23_1_29
           value: cockroachdb/cockroach:v23.1.29
+        - name: RELATED_IMAGE_COCKROACH_v23_1_30
+          value: cockroachdb/cockroach:v23.1.30
         - name: RELATED_IMAGE_COCKROACH_v23_2_0
           value: cockroachdb/cockroach:v23.2.0
         - name: RELATED_IMAGE_COCKROACH_v23_2_1
@@ -623,6 +625,8 @@ spec:
           value: cockroachdb/cockroach:v23.2.15
         - name: RELATED_IMAGE_COCKROACH_v23_2_16
           value: cockroachdb/cockroach:v23.2.16
+        - name: RELATED_IMAGE_COCKROACH_v23_2_17
+          value: cockroachdb/cockroach:v23.2.17
         - name: RELATED_IMAGE_COCKROACH_v24_1_0
           value: cockroachdb/cockroach:v24.1.0
         - name: RELATED_IMAGE_COCKROACH_v24_1_1
@@ -639,6 +643,8 @@ spec:
           value: cockroachdb/cockroach:v24.1.6
         - name: RELATED_IMAGE_COCKROACH_v24_1_7
           value: cockroachdb/cockroach:v24.1.7
+        - name: RELATED_IMAGE_COCKROACH_v24_1_8
+          value: cockroachdb/cockroach:v24.1.8
         - name: RELATED_IMAGE_COCKROACH_v24_2_0
           value: cockroachdb/cockroach:v24.2.0
         - name: RELATED_IMAGE_COCKROACH_v24_2_2
@@ -649,8 +655,12 @@ spec:
           value: cockroachdb/cockroach:v24.2.4
         - name: RELATED_IMAGE_COCKROACH_v24_2_5
           value: cockroachdb/cockroach:v24.2.5
+        - name: RELATED_IMAGE_COCKROACH_v24_2_6
+          value: cockroachdb/cockroach:v24.2.6
         - name: RELATED_IMAGE_COCKROACH_v24_3_0
           value: cockroachdb/cockroach:v24.3.0
+        - name: RELATED_IMAGE_COCKROACH_v24_3_1
+          value: cockroachdb/cockroach:v24.3.1
         - name: OPERATOR_NAME
           value: cockroachdb
         - name: POD_NAME