From 1b4a28ebc2ddedcb57db2080586b61e7d9bbcec9 Mon Sep 17 00:00:00 2001 From: CRL Release bot Date: Tue, 14 Jan 2025 00:27:02 +0000 Subject: [PATCH] Update supported CRDB versions. --- config/manager/patches/image.yaml | 10 +++++++++- .../cockroach-operator.clusterserviceversion.yaml | 8 ++++++++ config/manifests/patches/deployment_patch.yaml | 10 +++++++++- config/samples/crdb-tls-example.yaml | 4 ++-- crdb-versions.yaml | 12 ++++++++++++ examples/client-secure-operator.yaml | 4 ++-- examples/example.yaml | 6 +++--- examples/smoketest.yaml | 4 ++-- install/operator.yaml | 8 ++++++++ 9 files changed, 55 insertions(+), 11 deletions(-) diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml index a13860f43..25834cb87 100644 --- a/config/manager/patches/image.yaml +++ b/config/manager/patches/image.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 The Cockroach Authors +# Copyright 2025 The Cockroach Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -268,6 +268,8 @@ spec: value: cockroachdb/cockroach:v23.2.16 - name: RELATED_IMAGE_COCKROACH_v23_2_17 value: cockroachdb/cockroach:v23.2.17 + - name: RELATED_IMAGE_COCKROACH_v23_2_19 + value: cockroachdb/cockroach:v23.2.19 - name: RELATED_IMAGE_COCKROACH_v24_1_0 value: cockroachdb/cockroach:v24.1.0 - name: RELATED_IMAGE_COCKROACH_v24_1_1 @@ -286,6 +288,8 @@ spec: value: cockroachdb/cockroach:v24.1.7 - name: RELATED_IMAGE_COCKROACH_v24_1_8 value: cockroachdb/cockroach:v24.1.8 + - name: RELATED_IMAGE_COCKROACH_v24_1_10 + value: cockroachdb/cockroach:v24.1.10 - name: RELATED_IMAGE_COCKROACH_v24_2_0 value: cockroachdb/cockroach:v24.2.0 - name: RELATED_IMAGE_COCKROACH_v24_2_2 @@ -298,7 +302,11 @@ spec: value: cockroachdb/cockroach:v24.2.5 - name: RELATED_IMAGE_COCKROACH_v24_2_6 value: cockroachdb/cockroach:v24.2.6 + - name: RELATED_IMAGE_COCKROACH_v24_2_8 + value: cockroachdb/cockroach:v24.2.8 - 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: RELATED_IMAGE_COCKROACH_v24_3_3 + value: cockroachdb/cockroach:v24.3.3 diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml index 80d5dcf43..1ade0d795 100644 --- a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml @@ -441,6 +441,8 @@ spec: 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:1558a1f5eab79f1a8c6c85d81740cc539dc23025ea457c0019d93a72dc05d57a + name: RELATED_IMAGE_COCKROACH_v23_2_19 - 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 @@ -459,6 +461,8 @@ spec: 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:743cda1eda6e273c798e3405a9a97e07dd6aa5ad4d5a52789be3b0f39a32a039 + name: RELATED_IMAGE_COCKROACH_v24_1_10 - 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 @@ -471,10 +475,14 @@ spec: 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:db07461824e73410456ef540b0bce3c7fe550aa67a73d6174300ca74b8f75276 + name: RELATED_IMAGE_COCKROACH_v24_2_8 - 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: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f045fe5037d44aab1a0b2209241b3931ec7cb9897cb3c6a96a9f8d5280e55dd2 + name: RELATED_IMAGE_COCKROACH_v24_3_3 - 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 2a60d1d00..63d124472 100644 --- a/config/manifests/patches/deployment_patch.yaml +++ b/config/manifests/patches/deployment_patch.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 The Cockroach Authors +# Copyright 2025 The Cockroach Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -277,6 +277,8 @@ spec: 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_v23_2_19 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1558a1f5eab79f1a8c6c85d81740cc539dc23025ea457c0019d93a72dc05d57a - name: RELATED_IMAGE_COCKROACH_v24_1_0 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90 - name: RELATED_IMAGE_COCKROACH_v24_1_1 @@ -295,6 +297,8 @@ spec: 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_1_10 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:743cda1eda6e273c798e3405a9a97e07dd6aa5ad4d5a52789be3b0f39a32a039 - name: RELATED_IMAGE_COCKROACH_v24_2_0 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024 - name: RELATED_IMAGE_COCKROACH_v24_2_2 @@ -307,8 +311,12 @@ spec: 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_2_8 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:db07461824e73410456ef540b0bce3c7fe550aa67a73d6174300ca74b8f75276 - 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 + - name: RELATED_IMAGE_COCKROACH_v24_3_3 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f045fe5037d44aab1a0b2209241b3931ec7cb9897cb3c6a96a9f8d5280e55dd2 image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER diff --git a/config/samples/crdb-tls-example.yaml b/config/samples/crdb-tls-example.yaml index 6a2279ea1..e1c481ebd 100644 --- a/config/samples/crdb-tls-example.yaml +++ b/config/samples/crdb-tls-example.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 The Cockroach Authors +# Copyright 2025 The Cockroach Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ kind: CrdbCluster metadata: name: crdb-tls-example spec: - cockroachDBVersion: v24.3.1 + cockroachDBVersion: v24.3.3 dataStore: pvc: spec: diff --git a/crdb-versions.yaml b/crdb-versions.yaml index 2f93fa4cb..d2bdeb5b0 100644 --- a/crdb-versions.yaml +++ b/crdb-versions.yaml @@ -385,6 +385,9 @@ CrdbVersions: - image: cockroachdb/cockroach:v23.2.17 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b77b80eed7ce149d2a3f228e5f188e76d73f32bc50ecde20bba9cfa7bdc4714c tag: v23.2.17 +- image: cockroachdb/cockroach:v23.2.19 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1558a1f5eab79f1a8c6c85d81740cc539dc23025ea457c0019d93a72dc05d57a + tag: v23.2.19 - image: cockroachdb/cockroach:v24.1.0 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90 tag: v24.1.0 @@ -412,6 +415,9 @@ CrdbVersions: - image: cockroachdb/cockroach:v24.1.8 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1f6b1ec92251397dbcf7ed4a82f1f05619d64676aae2717f4eff1c33e4c2c27a tag: v24.1.8 +- image: cockroachdb/cockroach:v24.1.10 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:743cda1eda6e273c798e3405a9a97e07dd6aa5ad4d5a52789be3b0f39a32a039 + tag: v24.1.10 - image: cockroachdb/cockroach:v24.2.0 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024 tag: v24.2.0 @@ -430,9 +436,15 @@ CrdbVersions: - image: cockroachdb/cockroach:v24.2.6 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5d6901b6b6fd6594d42bfc1842d050c7cffcb0867a5591a67469f0f860b1f21b tag: v24.2.6 +- image: cockroachdb/cockroach:v24.2.8 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:db07461824e73410456ef540b0bce3c7fe550aa67a73d6174300ca74b8f75276 + tag: v24.2.8 - 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 +- image: cockroachdb/cockroach:v24.3.3 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f045fe5037d44aab1a0b2209241b3931ec7cb9897cb3c6a96a9f8d5280e55dd2 + tag: v24.3.3 diff --git a/examples/client-secure-operator.yaml b/examples/client-secure-operator.yaml index 76471d8cb..b6268ec22 100644 --- a/examples/client-secure-operator.yaml +++ b/examples/client-secure-operator.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 The Cockroach Authors +# Copyright 2025 The Cockroach Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ spec: serviceAccountName: cockroachdb-sa containers: - name: cockroachdb-client-secure - image: cockroachdb/cockroach:v24.3.1 + image: cockroachdb/cockroach:v24.3.3 imagePullPolicy: IfNotPresent volumeMounts: - name: client-certs diff --git a/examples/example.yaml b/examples/example.yaml index 8e56f35ef..9f802824f 100644 --- a/examples/example.yaml +++ b/examples/example.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 The Cockroach Authors +# Copyright 2025 The Cockroach Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -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.1 +# cockroachDBVersion: v24.3.3 image: - name: cockroachdb/cockroach:v24.3.1 + name: cockroachdb/cockroach:v24.3.3 # 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 60dc1b319..056549cba 100644 --- a/examples/smoketest.yaml +++ b/examples/smoketest.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 The Cockroach Authors +# Copyright 2025 The Cockroach Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -39,5 +39,5 @@ spec: memory: 300Mi tlsEnabled: true image: - name: cockroachdb/cockroach:v24.3.1 + name: cockroachdb/cockroach:v24.3.3 nodes: 3 diff --git a/install/operator.yaml b/install/operator.yaml index fd8df4fdd..fb06fb05b 100644 --- a/install/operator.yaml +++ b/install/operator.yaml @@ -629,6 +629,8 @@ spec: value: cockroachdb/cockroach:v23.2.16 - name: RELATED_IMAGE_COCKROACH_v23_2_17 value: cockroachdb/cockroach:v23.2.17 + - name: RELATED_IMAGE_COCKROACH_v23_2_19 + value: cockroachdb/cockroach:v23.2.19 - name: RELATED_IMAGE_COCKROACH_v24_1_0 value: cockroachdb/cockroach:v24.1.0 - name: RELATED_IMAGE_COCKROACH_v24_1_1 @@ -647,6 +649,8 @@ spec: value: cockroachdb/cockroach:v24.1.7 - name: RELATED_IMAGE_COCKROACH_v24_1_8 value: cockroachdb/cockroach:v24.1.8 + - name: RELATED_IMAGE_COCKROACH_v24_1_10 + value: cockroachdb/cockroach:v24.1.10 - name: RELATED_IMAGE_COCKROACH_v24_2_0 value: cockroachdb/cockroach:v24.2.0 - name: RELATED_IMAGE_COCKROACH_v24_2_2 @@ -659,10 +663,14 @@ spec: value: cockroachdb/cockroach:v24.2.5 - name: RELATED_IMAGE_COCKROACH_v24_2_6 value: cockroachdb/cockroach:v24.2.6 + - name: RELATED_IMAGE_COCKROACH_v24_2_8 + value: cockroachdb/cockroach:v24.2.8 - 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: RELATED_IMAGE_COCKROACH_v24_3_3 + value: cockroachdb/cockroach:v24.3.3 - name: OPERATOR_NAME value: cockroachdb - name: POD_NAME