Update supported CRDB versions. (#1046)

Co-authored-by: CRL Release bot <teamcity@cockroachlabs.com>
cockroachdb · Sep 23, 2024 · 27548b8 · 27548b8
1 parent 2638777
commit 27548b8
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 8 deletions.
diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml
@@ -280,6 +280,8 @@ spec:
               value: cockroachdb/cockroach:v23.1.24
             - name: RELATED_IMAGE_COCKROACH_v23_1_25
               value: cockroachdb/cockroach:v23.1.25
+            - name: RELATED_IMAGE_COCKROACH_v23_1_26
+              value: cockroachdb/cockroach:v23.1.26
             - name: RELATED_IMAGE_COCKROACH_v23_2_0
               value: cockroachdb/cockroach:v23.2.0
             - name: RELATED_IMAGE_COCKROACH_v23_2_1
@@ -300,6 +302,8 @@ spec:
               value: cockroachdb/cockroach:v23.2.9
             - name: RELATED_IMAGE_COCKROACH_v23_2_10
               value: cockroachdb/cockroach:v23.2.10
+            - name: RELATED_IMAGE_COCKROACH_v23_2_11
+              value: cockroachdb/cockroach:v23.2.11
             - name: RELATED_IMAGE_COCKROACH_v24_1_0
               value: cockroachdb/cockroach:v24.1.0
             - name: RELATED_IMAGE_COCKROACH_v24_1_1
@@ -312,3 +316,5 @@ spec:
               value: cockroachdb/cockroach:v24.1.4
             - name: RELATED_IMAGE_COCKROACH_v24_2_0
               value: cockroachdb/cockroach:v24.2.0
+            - name: RELATED_IMAGE_COCKROACH_v24_2_2
+              value: cockroachdb/cockroach:v24.2.2
diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
@@ -453,6 +453,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v23_1_24
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:29abb169ffefe36f6d69edd438a7135ee23059cedab8f87ad3b2d52361b96b35
     name: RELATED_IMAGE_COCKROACH_v23_1_25
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d467383af41aa80c26172964c34152abeba45121599804e502984655b72179f0
+    name: RELATED_IMAGE_COCKROACH_v23_1_26
   - 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
@@ -473,6 +475,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v23_2_9
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1ce71e80c0cd0e0063eba275ab91f77982f2e92a8aef8e89cab99b93feab0a88
     name: RELATED_IMAGE_COCKROACH_v23_2_10
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7d6320ac7fb0925f10cf6f524a13de629cbf13ccc371912e4fe8c777bc15d1b5
+    name: RELATED_IMAGE_COCKROACH_v23_2_11
   - 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
@@ -483,8 +487,10 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v24_1_3
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1b6d934a7b6c42a61e5ad51380e69af341a575b42205299fd58bc0c6ff306f6a
     name: RELATED_IMAGE_COCKROACH_v24_1_4
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd499d4a83a56b5c8dfa6de70d96dd2bcb9c053a705ad274f4b9a845818fb827
+  - 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
+    name: RELATED_IMAGE_COCKROACH_v24_2_2
   - 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
@@ -289,6 +289,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:46d9287ef11e3b21a36abfa31a26da3b93040bb6163b9223972a5dd1930fecff
             - name: RELATED_IMAGE_COCKROACH_v23_1_25
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:29abb169ffefe36f6d69edd438a7135ee23059cedab8f87ad3b2d52361b96b35
+            - name: RELATED_IMAGE_COCKROACH_v23_1_26
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d467383af41aa80c26172964c34152abeba45121599804e502984655b72179f0
             - name: RELATED_IMAGE_COCKROACH_v23_2_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:56109e57ee0379cf48644bcf8226a9238e01139cacc5499002c99f973f121911
             - name: RELATED_IMAGE_COCKROACH_v23_2_1
@@ -309,6 +311,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7ad12df8e258b03c4099d375d02d272bd774bf188d108901d5cf6cb865e57ef3
             - name: RELATED_IMAGE_COCKROACH_v23_2_10
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1ce71e80c0cd0e0063eba275ab91f77982f2e92a8aef8e89cab99b93feab0a88
+            - name: RELATED_IMAGE_COCKROACH_v23_2_11
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7d6320ac7fb0925f10cf6f524a13de629cbf13ccc371912e4fe8c777bc15d1b5
             - name: RELATED_IMAGE_COCKROACH_v24_1_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
             - name: RELATED_IMAGE_COCKROACH_v24_1_1
@@ -320,5 +324,7 @@ spec:
             - name: RELATED_IMAGE_COCKROACH_v24_1_4
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1b6d934a7b6c42a61e5ad51380e69af341a575b42205299fd58bc0c6ff306f6a
             - name: RELATED_IMAGE_COCKROACH_v24_2_0
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd499d4a83a56b5c8dfa6de70d96dd2bcb9c053a705ad274f4b9a845818fb827
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024
+            - name: RELATED_IMAGE_COCKROACH_v24_2_2
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:08cec123813304ab03bd66d72a09949667a874a42320bedafda391ebcdb2e56c
           image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
diff --git 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.2.0
+  cockroachDBVersion: v24.2.2
   dataStore:
     pvc:
       spec:

diff --git a/crdb-versions.yaml b/crdb-versions.yaml
@@ -403,6 +403,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v23.1.25
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:29abb169ffefe36f6d69edd438a7135ee23059cedab8f87ad3b2d52361b96b35
   tag: v23.1.25
+- image: cockroachdb/cockroach:v23.1.26
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d467383af41aa80c26172964c34152abeba45121599804e502984655b72179f0
+  tag: v23.1.26
 - image: cockroachdb/cockroach:v23.2.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:56109e57ee0379cf48644bcf8226a9238e01139cacc5499002c99f973f121911
   tag: v23.2.0
@@ -433,6 +436,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v23.2.10
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1ce71e80c0cd0e0063eba275ab91f77982f2e92a8aef8e89cab99b93feab0a88
   tag: v23.2.10
+- image: cockroachdb/cockroach:v23.2.11
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7d6320ac7fb0925f10cf6f524a13de629cbf13ccc371912e4fe8c777bc15d1b5
+  tag: v23.2.11
 - image: cockroachdb/cockroach:v24.1.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
   tag: v24.1.0
@@ -449,5 +455,8 @@ CrdbVersions:
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1b6d934a7b6c42a61e5ad51380e69af341a575b42205299fd58bc0c6ff306f6a
   tag: v24.1.4
 - image: cockroachdb/cockroach:v24.2.0
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd499d4a83a56b5c8dfa6de70d96dd2bcb9c053a705ad274f4b9a845818fb827
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024
   tag: v24.2.0
+- image: cockroachdb/cockroach:v24.2.2
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:08cec123813304ab03bd66d72a09949667a874a42320bedafda391ebcdb2e56c
+  tag: v24.2.2
diff --git 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.2.0
+    image: cockroachdb/cockroach:v24.2.2
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs

diff --git 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.2.0
+# cockroachDBVersion: v24.2.2
   image:
-    name: cockroachdb/cockroach:v24.2.0
+    name: cockroachdb/cockroach:v24.2.2
   # 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
@@ -39,5 +39,5 @@ spec:
       memory: 300Mi
   tlsEnabled: true
   image:
-    name: cockroachdb/cockroach:v24.2.0
+    name: cockroachdb/cockroach:v24.2.2
   nodes: 3
diff --git a/install/operator.yaml b/install/operator.yaml
@@ -638,6 +638,8 @@ spec:
           value: cockroachdb/cockroach:v23.1.24
         - name: RELATED_IMAGE_COCKROACH_v23_1_25
           value: cockroachdb/cockroach:v23.1.25
+        - name: RELATED_IMAGE_COCKROACH_v23_1_26
+          value: cockroachdb/cockroach:v23.1.26
         - name: RELATED_IMAGE_COCKROACH_v23_2_0
           value: cockroachdb/cockroach:v23.2.0
         - name: RELATED_IMAGE_COCKROACH_v23_2_1
@@ -658,6 +660,8 @@ spec:
           value: cockroachdb/cockroach:v23.2.9
         - name: RELATED_IMAGE_COCKROACH_v23_2_10
           value: cockroachdb/cockroach:v23.2.10
+        - name: RELATED_IMAGE_COCKROACH_v23_2_11
+          value: cockroachdb/cockroach:v23.2.11
         - name: RELATED_IMAGE_COCKROACH_v24_1_0
           value: cockroachdb/cockroach:v24.1.0
         - name: RELATED_IMAGE_COCKROACH_v24_1_1
@@ -670,6 +674,8 @@ spec:
           value: cockroachdb/cockroach:v24.1.4
         - name: RELATED_IMAGE_COCKROACH_v24_2_0
           value: cockroachdb/cockroach:v24.2.0
+        - name: RELATED_IMAGE_COCKROACH_v24_2_2
+          value: cockroachdb/cockroach:v24.2.2
         - name: OPERATOR_NAME
           value: cockroachdb
         - name: POD_NAME