Update supported CRDB versions.

Author: cockroach-teamcity

config/manager/patches/image.yaml

@@ -330,6 +330,8 @@ spec:
               value: cockroachdb/cockroach:v24.3.16
             - name: RELATED_IMAGE_COCKROACH_v24_3_17
               value: cockroachdb/cockroach:v24.3.17
+            - name: RELATED_IMAGE_COCKROACH_v24_3_18
+              value: cockroachdb/cockroach:v24.3.18
             - name: RELATED_IMAGE_COCKROACH_v25_1_0
               value: cockroachdb/cockroach:v25.1.0
             - name: RELATED_IMAGE_COCKROACH_v25_1_1
@@ -340,25 +342,7 @@ spec:
               value: cockroachdb/cockroach:v25.1.3
             - name: RELATED_IMAGE_COCKROACH_v25_1_4
               value: cockroachdb/cockroach:v25.1.4
-            - name: RELATED_IMAGE_COCKROACH_v25_1_5
-              value: cockroachdb/cockroach:v25.1.5
-            - name: RELATED_IMAGE_COCKROACH_v25_1_6
-              value: cockroachdb/cockroach:v25.1.6
-            - name: RELATED_IMAGE_COCKROACH_v25_1_7
-              value: cockroachdb/cockroach:v25.1.7
-            - name: RELATED_IMAGE_COCKROACH_v25_1_8
-              value: cockroachdb/cockroach:v25.1.8
-            - name: RELATED_IMAGE_COCKROACH_v25_1_9
-              value: cockroachdb/cockroach:v25.1.9
             - name: RELATED_IMAGE_COCKROACH_v25_1_10
               value: cockroachdb/cockroach:v25.1.10
-            - name: RELATED_IMAGE_COCKROACH_v25_2_0
-              value: cockroachdb/cockroach:v25.2.0
-            - name: RELATED_IMAGE_COCKROACH_v25_2_1
-              value: cockroachdb/cockroach:v25.2.1
-            - name: RELATED_IMAGE_COCKROACH_v25_2_2
-              value: cockroachdb/cockroach:v25.2.2
             - name: RELATED_IMAGE_COCKROACH_v25_2_3
               value: cockroachdb/cockroach:v25.2.3
-            - name: RELATED_IMAGE_COCKROACH_v25_2_4
-              value: cockroachdb/cockroach:v25.2.4

config/manifests/bases/cockroach-operator.clusterserviceversion.yaml

@@ -503,6 +503,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v24_3_16
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:deb5428cc5c557346dc1f306fd146431b18b989ceda2289279820c3539c9649f
     name: RELATED_IMAGE_COCKROACH_v24_3_17
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c5190ed994e87d78b242603dca4103e5f68c91639784dac0705f0be1eddcd442
+    name: RELATED_IMAGE_COCKROACH_v24_3_18
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
     name: RELATED_IMAGE_COCKROACH_v25_1_0
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd6c9b8ca82ff4f2d0fe29166d1fc9bca6439cb40907be60f4d8f1b9735de2f7
@@ -513,28 +515,10 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v25_1_3
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:022c6e1a0de875474bc953718a481a0af526c49dc910094dcdce0b5677aced18
     name: RELATED_IMAGE_COCKROACH_v25_1_4
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:79d688bebe0643ef0dd6ba7108cdb34c0442470c0c20ae0df88b5d02a3476cd0
-    name: RELATED_IMAGE_COCKROACH_v25_1_5
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e8f26fd132affbaeb8ef6b1807a646c83b301e5dc334a592dfb2cf8dc3dbaf10
-    name: RELATED_IMAGE_COCKROACH_v25_1_6
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cc20270212f01fc231ff788e20b0476b8228c440bfc40430c0836d5eb702a042
-    name: RELATED_IMAGE_COCKROACH_v25_1_7
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e18d73af3257c8cdf00245f2f718b56667524c1cc69d3db28e9b868a539ae16f
-    name: RELATED_IMAGE_COCKROACH_v25_1_8
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b2a93da21ce1d4d7f55a191aadefb17a6c14d5be70b824c5b2f01b225bf823b5
-    name: RELATED_IMAGE_COCKROACH_v25_1_9
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1380eecfc57447c07c8deca25084034e2ee89a758f41380b33a11f3c40f3493c
     name: RELATED_IMAGE_COCKROACH_v25_1_10
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c74cf927a2b2c5098ad74ad0880996f8b042186a9911d888a231ef5b9e2a0715
-    name: RELATED_IMAGE_COCKROACH_v25_2_0
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3b78a4d3864e16d270979d9d7756012abf09e6cdb7f1eb4832f6497c26281099
-    name: RELATED_IMAGE_COCKROACH_v25_2_1
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f42fa22aac3cc41ce72e144a72530ffbee765a392b24593dafd06cc098f8410b
-    name: RELATED_IMAGE_COCKROACH_v25_2_2
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:ace6130bc3492ce826fdb2363a20c7b9dea8ad307e2893b81a4ff7172d0bde6a
     name: RELATED_IMAGE_COCKROACH_v25_2_3
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:77b933878faae575e2b8df45a2a7580da204f6de6ed40c6c0b7d4ae753287e60
-    name: RELATED_IMAGE_COCKROACH_v25_2_4
   - image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
     name: RELATED_IMAGE_COCKROACH_OPERATOR
   version: 0.0.0

config/manifests/patches/deployment_patch.yaml

@@ -339,6 +339,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:90b14d2c9e36932f5cdb0044d3d27c8cad8f4bfd05808dc04c2eaf1fef010974
             - name: RELATED_IMAGE_COCKROACH_v24_3_17
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:deb5428cc5c557346dc1f306fd146431b18b989ceda2289279820c3539c9649f
+            - name: RELATED_IMAGE_COCKROACH_v24_3_18
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c5190ed994e87d78b242603dca4103e5f68c91639784dac0705f0be1eddcd442
             - name: RELATED_IMAGE_COCKROACH_v25_1_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
             - name: RELATED_IMAGE_COCKROACH_v25_1_1
@@ -349,28 +351,10 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:da3bd2e9ff2b08d5bb86b1f5faa95a865f85c5e8912df00b6b79190c1e518a2f
             - name: RELATED_IMAGE_COCKROACH_v25_1_4
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:022c6e1a0de875474bc953718a481a0af526c49dc910094dcdce0b5677aced18
-            - name: RELATED_IMAGE_COCKROACH_v25_1_5
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:79d688bebe0643ef0dd6ba7108cdb34c0442470c0c20ae0df88b5d02a3476cd0
-            - name: RELATED_IMAGE_COCKROACH_v25_1_6
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e8f26fd132affbaeb8ef6b1807a646c83b301e5dc334a592dfb2cf8dc3dbaf10
-            - name: RELATED_IMAGE_COCKROACH_v25_1_7
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cc20270212f01fc231ff788e20b0476b8228c440bfc40430c0836d5eb702a042
-            - name: RELATED_IMAGE_COCKROACH_v25_1_8
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e18d73af3257c8cdf00245f2f718b56667524c1cc69d3db28e9b868a539ae16f
-            - name: RELATED_IMAGE_COCKROACH_v25_1_9
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b2a93da21ce1d4d7f55a191aadefb17a6c14d5be70b824c5b2f01b225bf823b5
             - name: RELATED_IMAGE_COCKROACH_v25_1_10
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1380eecfc57447c07c8deca25084034e2ee89a758f41380b33a11f3c40f3493c
-            - name: RELATED_IMAGE_COCKROACH_v25_2_0
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c74cf927a2b2c5098ad74ad0880996f8b042186a9911d888a231ef5b9e2a0715
-            - name: RELATED_IMAGE_COCKROACH_v25_2_1
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3b78a4d3864e16d270979d9d7756012abf09e6cdb7f1eb4832f6497c26281099
-            - name: RELATED_IMAGE_COCKROACH_v25_2_2
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f42fa22aac3cc41ce72e144a72530ffbee765a392b24593dafd06cc098f8410b
             - name: RELATED_IMAGE_COCKROACH_v25_2_3
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:ace6130bc3492ce826fdb2363a20c7b9dea8ad307e2893b81a4ff7172d0bde6a
-            - name: RELATED_IMAGE_COCKROACH_v25_2_4
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:77b933878faae575e2b8df45a2a7580da204f6de6ed40c6c0b7d4ae753287e60
             - name: RELATED_IMAGE_COCKROACH_OPERATOR
               value: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
           image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER

config/samples/crdb-tls-example.yaml

@@ -19,7 +19,7 @@ kind: CrdbCluster
 metadata:
   name: crdb-tls-example
 spec:
-  cockroachDBVersion: v25.2.4
+  cockroachDBVersion: v25.2.3
   dataStore:
     pvc:
       spec:

crdb-versions.yaml

@@ -478,6 +478,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v24.3.17
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:deb5428cc5c557346dc1f306fd146431b18b989ceda2289279820c3539c9649f
   tag: v24.3.17
+- image: cockroachdb/cockroach:v24.3.18
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c5190ed994e87d78b242603dca4103e5f68c91639784dac0705f0be1eddcd442
+  tag: v24.3.18
 - image: cockroachdb/cockroach:v25.1.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
   tag: v25.1.0
@@ -493,36 +496,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v25.1.4
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:022c6e1a0de875474bc953718a481a0af526c49dc910094dcdce0b5677aced18
   tag: v25.1.4
-- image: cockroachdb/cockroach:v25.1.5
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:79d688bebe0643ef0dd6ba7108cdb34c0442470c0c20ae0df88b5d02a3476cd0
-  tag: v25.1.5
-- image: cockroachdb/cockroach:v25.1.6
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e8f26fd132affbaeb8ef6b1807a646c83b301e5dc334a592dfb2cf8dc3dbaf10
-  tag: v25.1.6
-- image: cockroachdb/cockroach:v25.1.7
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cc20270212f01fc231ff788e20b0476b8228c440bfc40430c0836d5eb702a042
-  tag: v25.1.7
-- image: cockroachdb/cockroach:v25.1.8
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e18d73af3257c8cdf00245f2f718b56667524c1cc69d3db28e9b868a539ae16f
-  tag: v25.1.8
-- image: cockroachdb/cockroach:v25.1.9
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b2a93da21ce1d4d7f55a191aadefb17a6c14d5be70b824c5b2f01b225bf823b5
-  tag: v25.1.9
 - image: cockroachdb/cockroach:v25.1.10
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1380eecfc57447c07c8deca25084034e2ee89a758f41380b33a11f3c40f3493c
   tag: v25.1.10
-- image: cockroachdb/cockroach:v25.2.0
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c74cf927a2b2c5098ad74ad0880996f8b042186a9911d888a231ef5b9e2a0715
-  tag: v25.2.0
-- image: cockroachdb/cockroach:v25.2.1
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3b78a4d3864e16d270979d9d7756012abf09e6cdb7f1eb4832f6497c26281099
-  tag: v25.2.1
-- image: cockroachdb/cockroach:v25.2.2
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f42fa22aac3cc41ce72e144a72530ffbee765a392b24593dafd06cc098f8410b
-  tag: v25.2.2
 - image: cockroachdb/cockroach:v25.2.3
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:ace6130bc3492ce826fdb2363a20c7b9dea8ad307e2893b81a4ff7172d0bde6a
   tag: v25.2.3
-- image: cockroachdb/cockroach:v25.2.4
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:77b933878faae575e2b8df45a2a7580da204f6de6ed40c6c0b7d4ae753287e60
-  tag: v25.2.4

examples/client-secure-operator.yaml

@@ -23,7 +23,7 @@ spec:
   serviceAccountName: cockroachdb-sa
   containers:
   - name: cockroachdb-client-secure
-    image: cockroachdb/cockroach:v25.2.4
+    image: cockroachdb/cockroach:v25.2.3
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs

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: v25.2.4
+# cockroachDBVersion: v25.2.3
   image:
-    name: cockroachdb/cockroach:v25.2.4
+    name: cockroachdb/cockroach:v25.2.3
   # nodes refers to the number of crdb pods that are created
   # via the statefulset
   nodes: 3

examples/smoketest.yaml

@@ -39,5 +39,5 @@ spec:
       memory: 300Mi
   tlsEnabled: true
   image:
-    name: cockroachdb/cockroach:v25.2.4
+    name: cockroachdb/cockroach:v25.2.3
   nodes: 3

install/operator.yaml

@@ -689,6 +689,8 @@ spec:
           value: cockroachdb/cockroach:v24.3.16
         - name: RELATED_IMAGE_COCKROACH_v24_3_17
           value: cockroachdb/cockroach:v24.3.17
+        - name: RELATED_IMAGE_COCKROACH_v24_3_18
+          value: cockroachdb/cockroach:v24.3.18
         - name: RELATED_IMAGE_COCKROACH_v25_1_0
           value: cockroachdb/cockroach:v25.1.0
         - name: RELATED_IMAGE_COCKROACH_v25_1_1
@@ -699,28 +701,10 @@ spec:
           value: cockroachdb/cockroach:v25.1.3
         - name: RELATED_IMAGE_COCKROACH_v25_1_4
           value: cockroachdb/cockroach:v25.1.4
-        - name: RELATED_IMAGE_COCKROACH_v25_1_5
-          value: cockroachdb/cockroach:v25.1.5
-        - name: RELATED_IMAGE_COCKROACH_v25_1_6
-          value: cockroachdb/cockroach:v25.1.6
-        - name: RELATED_IMAGE_COCKROACH_v25_1_7
-          value: cockroachdb/cockroach:v25.1.7
-        - name: RELATED_IMAGE_COCKROACH_v25_1_8
-          value: cockroachdb/cockroach:v25.1.8
-        - name: RELATED_IMAGE_COCKROACH_v25_1_9
-          value: cockroachdb/cockroach:v25.1.9
         - name: RELATED_IMAGE_COCKROACH_v25_1_10
           value: cockroachdb/cockroach:v25.1.10
-        - name: RELATED_IMAGE_COCKROACH_v25_2_0
-          value: cockroachdb/cockroach:v25.2.0
-        - name: RELATED_IMAGE_COCKROACH_v25_2_1
-          value: cockroachdb/cockroach:v25.2.1
-        - name: RELATED_IMAGE_COCKROACH_v25_2_2
-          value: cockroachdb/cockroach:v25.2.2
         - name: RELATED_IMAGE_COCKROACH_v25_2_3
           value: cockroachdb/cockroach:v25.2.3
-        - name: RELATED_IMAGE_COCKROACH_v25_2_4
-          value: cockroachdb/cockroach:v25.2.4
         - name: OPERATOR_NAME
           value: cockroachdb
         - name: POD_NAME