Update supported CRDB versions.

Author: cockroach-teamcity

config/manager/patches/image.yaml

@@ -344,37 +344,5 @@ spec:
               value: cockroachdb/cockroach:v24.3.32
             - name: RELATED_IMAGE_COCKROACH_v24_3_33
               value: cockroachdb/cockroach:v24.3.33
-            - name: RELATED_IMAGE_COCKROACH_v25_1_0
-              value: cockroachdb/cockroach:v25.1.0
-            - name: RELATED_IMAGE_COCKROACH_v25_1_1
-              value: cockroachdb/cockroach:v25.1.1
-            - name: RELATED_IMAGE_COCKROACH_v25_1_2
-              value: cockroachdb/cockroach:v25.1.2
-            - name: RELATED_IMAGE_COCKROACH_v25_1_3
-              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_10
-              value: cockroachdb/cockroach:v25.2.10
-            - name: RELATED_IMAGE_COCKROACH_v25_2_11
-              value: cockroachdb/cockroach:v25.2.11
-            - name: RELATED_IMAGE_COCKROACH_v25_2_12
-              value: cockroachdb/cockroach:v25.2.12
-            - name: RELATED_IMAGE_COCKROACH_v26_2_1
-              value: cockroachdb/cockroach:v26.2.1
+            - name: RELATED_IMAGE_COCKROACH_v26_2_2
+              value: cockroachdb/cockroach:v26.2.2

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

@@ -517,40 +517,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v24_3_32
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:4b707f0ddf0945c5d7f83a63b999c1d844a4a812dc93ed138c04914e31af6b57
     name: RELATED_IMAGE_COCKROACH_v24_3_33
-  - 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
-    name: RELATED_IMAGE_COCKROACH_v25_1_1
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b83eaff2e217c06098509709cead525b55b00ccd48019d8357e6231892008055
-    name: RELATED_IMAGE_COCKROACH_v25_1_2
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:da3bd2e9ff2b08d5bb86b1f5faa95a865f85c5e8912df00b6b79190c1e518a2f
-    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:51a717edb6cb122b933d30bbddda8e65dd6312f521ccacacf4b014437d3128b9
-    name: RELATED_IMAGE_COCKROACH_v25_2_10
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b80d4524cdd3e2d1a0cfb76cb7d7f89d84683e06d2b8ce26b8d36429f2866f5c
-    name: RELATED_IMAGE_COCKROACH_v25_2_11
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6164369a5e863c42f6c43c76612d9221419c01ee17fcf146298df0993b60a441
-    name: RELATED_IMAGE_COCKROACH_v25_2_12
-  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:25ebcaf1401f97f35796cad9dc5a9f722786d6c09cc920642e74a18b0bc40751
-    name: RELATED_IMAGE_COCKROACH_v26_2_1
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1842be1193ef96ed27c14b995d59342fe0a80f9d653acf335f1c67791905df72
+    name: RELATED_IMAGE_COCKROACH_v26_2_2
   - image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
     name: RELATED_IMAGE_COCKROACH_OPERATOR
   version: 0.0.0

config/manifests/patches/deployment_patch.yaml

@@ -353,40 +353,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:02020b90c76a69a0ab4a0f6c0997e3969242ad1159fd7380fcc1ccd7a060753e
             - name: RELATED_IMAGE_COCKROACH_v24_3_33
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:4b707f0ddf0945c5d7f83a63b999c1d844a4a812dc93ed138c04914e31af6b57
-            - name: RELATED_IMAGE_COCKROACH_v25_1_0
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
-            - name: RELATED_IMAGE_COCKROACH_v25_1_1
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd6c9b8ca82ff4f2d0fe29166d1fc9bca6439cb40907be60f4d8f1b9735de2f7
-            - name: RELATED_IMAGE_COCKROACH_v25_1_2
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b83eaff2e217c06098509709cead525b55b00ccd48019d8357e6231892008055
-            - name: RELATED_IMAGE_COCKROACH_v25_1_3
-              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_10
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:51a717edb6cb122b933d30bbddda8e65dd6312f521ccacacf4b014437d3128b9
-            - name: RELATED_IMAGE_COCKROACH_v25_2_11
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b80d4524cdd3e2d1a0cfb76cb7d7f89d84683e06d2b8ce26b8d36429f2866f5c
-            - name: RELATED_IMAGE_COCKROACH_v25_2_12
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6164369a5e863c42f6c43c76612d9221419c01ee17fcf146298df0993b60a441
-            - name: RELATED_IMAGE_COCKROACH_v26_2_1
-              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:25ebcaf1401f97f35796cad9dc5a9f722786d6c09cc920642e74a18b0bc40751
+            - name: RELATED_IMAGE_COCKROACH_v26_2_2
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1842be1193ef96ed27c14b995d59342fe0a80f9d653acf335f1c67791905df72
             - 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: v26.2.1
+  cockroachDBVersion: v26.2.2
   dataStore:
     pvc:
       spec:

crdb-versions.yaml

@@ -499,54 +499,6 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v24.3.33
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:4b707f0ddf0945c5d7f83a63b999c1d844a4a812dc93ed138c04914e31af6b57
   tag: v24.3.33
-- image: cockroachdb/cockroach:v25.1.0
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
-  tag: v25.1.0
-- image: cockroachdb/cockroach:v25.1.1
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd6c9b8ca82ff4f2d0fe29166d1fc9bca6439cb40907be60f4d8f1b9735de2f7
-  tag: v25.1.1
-- image: cockroachdb/cockroach:v25.1.2
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b83eaff2e217c06098509709cead525b55b00ccd48019d8357e6231892008055
-  tag: v25.1.2
-- image: cockroachdb/cockroach:v25.1.3
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:da3bd2e9ff2b08d5bb86b1f5faa95a865f85c5e8912df00b6b79190c1e518a2f
-  tag: v25.1.3
-- 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.10
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:51a717edb6cb122b933d30bbddda8e65dd6312f521ccacacf4b014437d3128b9
-  tag: v25.2.10
-- image: cockroachdb/cockroach:v25.2.11
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b80d4524cdd3e2d1a0cfb76cb7d7f89d84683e06d2b8ce26b8d36429f2866f5c
-  tag: v25.2.11
-- image: cockroachdb/cockroach:v25.2.12
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6164369a5e863c42f6c43c76612d9221419c01ee17fcf146298df0993b60a441
-  tag: v25.2.12
-- image: cockroachdb/cockroach:v26.2.1
-  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:25ebcaf1401f97f35796cad9dc5a9f722786d6c09cc920642e74a18b0bc40751
-  tag: v26.2.1
+- image: cockroachdb/cockroach:v26.2.2
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1842be1193ef96ed27c14b995d59342fe0a80f9d653acf335f1c67791905df72
+  tag: v26.2.2

examples/client-secure-operator.yaml

@@ -23,7 +23,7 @@ spec:
   serviceAccountName: cockroachdb-sa
   containers:
   - name: cockroachdb-client-secure
-    image: cockroachdb/cockroach:v26.2.1
+    image: cockroachdb/cockroach:v26.2.2
     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: v26.2.1
+# cockroachDBVersion: v26.2.2
   image:
-    name: cockroachdb/cockroach:v26.2.1
+    name: cockroachdb/cockroach:v26.2.2
   # 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:v26.2.1
+    name: cockroachdb/cockroach:v26.2.2
   nodes: 3

install/operator.yaml

@@ -703,40 +703,8 @@ spec:
           value: cockroachdb/cockroach:v24.3.32
         - name: RELATED_IMAGE_COCKROACH_v24_3_33
           value: cockroachdb/cockroach:v24.3.33
-        - name: RELATED_IMAGE_COCKROACH_v25_1_0
-          value: cockroachdb/cockroach:v25.1.0
-        - name: RELATED_IMAGE_COCKROACH_v25_1_1
-          value: cockroachdb/cockroach:v25.1.1
-        - name: RELATED_IMAGE_COCKROACH_v25_1_2
-          value: cockroachdb/cockroach:v25.1.2
-        - name: RELATED_IMAGE_COCKROACH_v25_1_3
-          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_10
-          value: cockroachdb/cockroach:v25.2.10
-        - name: RELATED_IMAGE_COCKROACH_v25_2_11
-          value: cockroachdb/cockroach:v25.2.11
-        - name: RELATED_IMAGE_COCKROACH_v25_2_12
-          value: cockroachdb/cockroach:v25.2.12
-        - name: RELATED_IMAGE_COCKROACH_v26_2_1
-          value: cockroachdb/cockroach:v26.2.1
+        - name: RELATED_IMAGE_COCKROACH_v26_2_2
+          value: cockroachdb/cockroach:v26.2.2
         - name: OPERATOR_NAME
           value: cockroachdb
         - name: POD_NAME