Update CRDB versions (#912)

Co-authored-by: GitHub Actions <[email protected]>
cockroachdb · Jun 7, 2022 · c6172d4 · c6172d4
1 parent 561cf47
commit c6172d4
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 5 deletions.
diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml
@@ -142,5 +142,9 @@ spec:
               value: cockroachdb/cockroach:v21.2.10
             - name: RELATED_IMAGE_COCKROACH_v21_2_11
               value: cockroachdb/cockroach:v21.2.11
+            - name: RELATED_IMAGE_COCKROACH_v21_2_12
+              value: cockroachdb/cockroach:v21.2.12
             - name: RELATED_IMAGE_COCKROACH_v22_1_0
               value: cockroachdb/cockroach:v22.1.0
+            - name: RELATED_IMAGE_COCKROACH_v22_1_1
+              value: cockroachdb/cockroach:v22.1.1
diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
@@ -298,5 +298,9 @@ spec:
     image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7daaf1368ab2c25694cdea0a598e1de59247b04a4b4b4b8348ed6edbaa194f9d
   - name: RELATED_IMAGE_COCKROACH_v21_2_11
     image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2b5c028f293c6f394e58a5495cb3dbfbedc215d0d03778d0217e045586d55a46
+  - name: RELATED_IMAGE_COCKROACH_v21_2_12
+    image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:ce3d94a3fbdcde5858beb3c265987759971d991c397c6486e19904bd4706f44d
   - name: RELATED_IMAGE_COCKROACH_v22_1_0
     image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5a54d564e08baefc2786f4b742b2507d31984664cd00333406aa7a3aa5b9c913
+  - name: RELATED_IMAGE_COCKROACH_v22_1_1
+    image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e23af8f9d32c3f80a52d79ceb4b359dda1d75ba0dd4cb8ed4b66ac2f4e40c69b
diff --git a/config/manifests/patches/deployment_patch.yaml b/config/manifests/patches/deployment_patch.yaml
@@ -151,6 +151,10 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7daaf1368ab2c25694cdea0a598e1de59247b04a4b4b4b8348ed6edbaa194f9d
             - name: RELATED_IMAGE_COCKROACH_v21_2_11
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2b5c028f293c6f394e58a5495cb3dbfbedc215d0d03778d0217e045586d55a46
+            - name: RELATED_IMAGE_COCKROACH_v21_2_12
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:ce3d94a3fbdcde5858beb3c265987759971d991c397c6486e19904bd4706f44d
             - name: RELATED_IMAGE_COCKROACH_v22_1_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5a54d564e08baefc2786f4b742b2507d31984664cd00333406aa7a3aa5b9c913
+            - name: RELATED_IMAGE_COCKROACH_v22_1_1
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e23af8f9d32c3f80a52d79ceb4b359dda1d75ba0dd4cb8ed4b66ac2f4e40c69b
           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: v22.1.0
+  cockroachDBVersion: v22.1.1
   dataStore:
     pvc:
       spec:

diff --git a/crdb-versions.yaml b/crdb-versions.yaml
@@ -196,6 +196,12 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v21.2.11
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2b5c028f293c6f394e58a5495cb3dbfbedc215d0d03778d0217e045586d55a46
   tag: v21.2.11
+- image: cockroachdb/cockroach:v21.2.12
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:ce3d94a3fbdcde5858beb3c265987759971d991c397c6486e19904bd4706f44d
+  tag: v21.2.12
 - image: cockroachdb/cockroach:v22.1.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5a54d564e08baefc2786f4b742b2507d31984664cd00333406aa7a3aa5b9c913
   tag: v22.1.0
+- image: cockroachdb/cockroach:v22.1.1
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e23af8f9d32c3f80a52d79ceb4b359dda1d75ba0dd4cb8ed4b66ac2f4e40c69b
+  tag: v22.1.1
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:v22.1.0
+    image: cockroachdb/cockroach:v22.1.1
     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: v22.1.0
+# cockroachDBVersion: v22.1.1
   image:
-    name: cockroachdb/cockroach:v22.1.0
+    name: cockroachdb/cockroach:v22.1.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
@@ -39,5 +39,5 @@ spec:
       memory: 300Mi
   tlsEnabled: true
   image:
-    name: cockroachdb/cockroach:v22.1.0
+    name: cockroachdb/cockroach:v22.1.1
   nodes: 3
diff --git a/install/operator.yaml b/install/operator.yaml
@@ -500,8 +500,12 @@ spec:
           value: cockroachdb/cockroach:v21.2.10
         - name: RELATED_IMAGE_COCKROACH_v21_2_11
           value: cockroachdb/cockroach:v21.2.11
+        - name: RELATED_IMAGE_COCKROACH_v21_2_12
+          value: cockroachdb/cockroach:v21.2.12
         - name: RELATED_IMAGE_COCKROACH_v22_1_0
           value: cockroachdb/cockroach:v22.1.0
+        - name: RELATED_IMAGE_COCKROACH_v22_1_1
+          value: cockroachdb/cockroach:v22.1.1
         - name: OPERATOR_NAME
           value: cockroachdb
         - name: POD_NAME