From 3b011bc92790f30c167ccff7d4812e5558e69ccc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 21:24:20 +0530 Subject: [PATCH] Update supported CRDB versions. (#1040) Co-authored-by: CRL Release bot --- config/manager/patches/image.yaml | 10 ++++++++++ .../cockroach-operator.clusterserviceversion.yaml | 10 ++++++++++ config/manifests/patches/deployment_patch.yaml | 10 ++++++++++ config/samples/crdb-tls-example.yaml | 2 +- crdb-versions.yaml | 15 +++++++++++++++ examples/client-secure-operator.yaml | 2 +- examples/example.yaml | 4 ++-- examples/smoketest.yaml | 2 +- install/operator.yaml | 10 ++++++++++ 9 files changed, 60 insertions(+), 5 deletions(-) diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml index fbd4f2971..eeabbccf7 100644 --- a/config/manager/patches/image.yaml +++ b/config/manager/patches/image.yaml @@ -276,6 +276,10 @@ spec: value: cockroachdb/cockroach:v23.1.22 - name: RELATED_IMAGE_COCKROACH_v23_1_23 value: cockroachdb/cockroach:v23.1.23 + - name: RELATED_IMAGE_COCKROACH_v23_1_24 + value: cockroachdb/cockroach:v23.1.24 + - name: RELATED_IMAGE_COCKROACH_v23_1_25 + value: cockroachdb/cockroach:v23.1.25 - name: RELATED_IMAGE_COCKROACH_v23_2_0 value: cockroachdb/cockroach:v23.2.0 - name: RELATED_IMAGE_COCKROACH_v23_2_1 @@ -292,9 +296,15 @@ spec: value: cockroachdb/cockroach:v23.2.7 - name: RELATED_IMAGE_COCKROACH_v23_2_8 value: cockroachdb/cockroach:v23.2.8 + - name: RELATED_IMAGE_COCKROACH_v23_2_9 + value: cockroachdb/cockroach:v23.2.9 - name: RELATED_IMAGE_COCKROACH_v24_1_0 value: cockroachdb/cockroach:v24.1.0 - name: RELATED_IMAGE_COCKROACH_v24_1_1 value: cockroachdb/cockroach:v24.1.1 - name: RELATED_IMAGE_COCKROACH_v24_1_2 value: cockroachdb/cockroach:v24.1.2 + - name: RELATED_IMAGE_COCKROACH_v24_1_3 + value: cockroachdb/cockroach:v24.1.3 + - name: RELATED_IMAGE_COCKROACH_v24_2_0 + value: cockroachdb/cockroach:v24.2.0 diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml index 68dd8cfd6..04ada7197 100644 --- a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml @@ -449,6 +449,10 @@ spec: name: RELATED_IMAGE_COCKROACH_v23_1_22 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1d78c2e0709214f96794564f13386861f4b541e55b5bd316ad495cf104f7d40b name: RELATED_IMAGE_COCKROACH_v23_1_23 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:46d9287ef11e3b21a36abfa31a26da3b93040bb6163b9223972a5dd1930fecff + 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:56109e57ee0379cf48644bcf8226a9238e01139cacc5499002c99f973f121911 name: RELATED_IMAGE_COCKROACH_v23_2_0 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:4e5f7df1dc1e1db398c36d590431e7e5782897b209972d8e9e4671971c10d1b6 @@ -465,12 +469,18 @@ spec: name: RELATED_IMAGE_COCKROACH_v23_2_7 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6408f89b0a88ec154f7ee98c314be574971c4c9aaf906b473d10124d822889be name: RELATED_IMAGE_COCKROACH_v23_2_8 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7ad12df8e258b03c4099d375d02d272bd774bf188d108901d5cf6cb865e57ef3 + name: RELATED_IMAGE_COCKROACH_v23_2_9 - 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 name: RELATED_IMAGE_COCKROACH_v24_1_1 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:87db6e079b96fb392d98ef5fc7063836bff10717efd75061016ce688be0ba38e name: RELATED_IMAGE_COCKROACH_v24_1_2 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:61e602b0e3582bf00460eb9328808ccf66e3ff1b1f6df07ee6c5c76a91846876 + name: RELATED_IMAGE_COCKROACH_v24_1_3 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd499d4a83a56b5c8dfa6de70d96dd2bcb9c053a705ad274f4b9a845818fb827 + name: RELATED_IMAGE_COCKROACH_v24_2_0 - 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 997440884..e1f2bfc21 100644 --- a/config/manifests/patches/deployment_patch.yaml +++ b/config/manifests/patches/deployment_patch.yaml @@ -285,6 +285,10 @@ spec: value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:bd336715332f776a72aaf5c3ca52e62dd53a9e8521c1feb6e135cc868d694a39 - name: RELATED_IMAGE_COCKROACH_v23_1_23 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1d78c2e0709214f96794564f13386861f4b541e55b5bd316ad495cf104f7d40b + - name: RELATED_IMAGE_COCKROACH_v23_1_24 + 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_2_0 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:56109e57ee0379cf48644bcf8226a9238e01139cacc5499002c99f973f121911 - name: RELATED_IMAGE_COCKROACH_v23_2_1 @@ -301,10 +305,16 @@ spec: value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:dd521d7bad62da054eec54179be75c643a5492d981e11c0e66db41902cd2182c - name: RELATED_IMAGE_COCKROACH_v23_2_8 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6408f89b0a88ec154f7ee98c314be574971c4c9aaf906b473d10124d822889be + - name: RELATED_IMAGE_COCKROACH_v23_2_9 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7ad12df8e258b03c4099d375d02d272bd774bf188d108901d5cf6cb865e57ef3 - name: RELATED_IMAGE_COCKROACH_v24_1_0 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90 - name: RELATED_IMAGE_COCKROACH_v24_1_1 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1374cbdc4ecf38e4b4226328f532e830b8932b34d9449bf2fbb36e60d0310521 - name: RELATED_IMAGE_COCKROACH_v24_1_2 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:87db6e079b96fb392d98ef5fc7063836bff10717efd75061016ce688be0ba38e + - name: RELATED_IMAGE_COCKROACH_v24_1_3 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:61e602b0e3582bf00460eb9328808ccf66e3ff1b1f6df07ee6c5c76a91846876 + - name: RELATED_IMAGE_COCKROACH_v24_2_0 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd499d4a83a56b5c8dfa6de70d96dd2bcb9c053a705ad274f4b9a845818fb827 image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER diff --git a/config/samples/crdb-tls-example.yaml b/config/samples/crdb-tls-example.yaml index c6afaa8cb..c6a1ef33c 100644 --- 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.1.2 + cockroachDBVersion: v24.2.0 dataStore: pvc: spec: diff --git a/crdb-versions.yaml b/crdb-versions.yaml index f21804060..e84f755e0 100644 --- a/crdb-versions.yaml +++ b/crdb-versions.yaml @@ -397,6 +397,12 @@ CrdbVersions: - image: cockroachdb/cockroach:v23.1.23 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1d78c2e0709214f96794564f13386861f4b541e55b5bd316ad495cf104f7d40b tag: v23.1.23 +- image: cockroachdb/cockroach:v23.1.24 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:46d9287ef11e3b21a36abfa31a26da3b93040bb6163b9223972a5dd1930fecff + tag: v23.1.24 +- image: cockroachdb/cockroach:v23.1.25 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:29abb169ffefe36f6d69edd438a7135ee23059cedab8f87ad3b2d52361b96b35 + tag: v23.1.25 - image: cockroachdb/cockroach:v23.2.0 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:56109e57ee0379cf48644bcf8226a9238e01139cacc5499002c99f973f121911 tag: v23.2.0 @@ -421,6 +427,9 @@ CrdbVersions: - image: cockroachdb/cockroach:v23.2.8 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6408f89b0a88ec154f7ee98c314be574971c4c9aaf906b473d10124d822889be tag: v23.2.8 +- image: cockroachdb/cockroach:v23.2.9 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7ad12df8e258b03c4099d375d02d272bd774bf188d108901d5cf6cb865e57ef3 + tag: v23.2.9 - image: cockroachdb/cockroach:v24.1.0 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90 tag: v24.1.0 @@ -430,3 +439,9 @@ CrdbVersions: - image: cockroachdb/cockroach:v24.1.2 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:87db6e079b96fb392d98ef5fc7063836bff10717efd75061016ce688be0ba38e tag: v24.1.2 +- image: cockroachdb/cockroach:v24.1.3 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:61e602b0e3582bf00460eb9328808ccf66e3ff1b1f6df07ee6c5c76a91846876 + tag: v24.1.3 +- image: cockroachdb/cockroach:v24.2.0 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd499d4a83a56b5c8dfa6de70d96dd2bcb9c053a705ad274f4b9a845818fb827 + tag: v24.2.0 diff --git a/examples/client-secure-operator.yaml b/examples/client-secure-operator.yaml index 71b51ff26..1148f5270 100644 --- 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.1.2 + image: cockroachdb/cockroach:v24.2.0 imagePullPolicy: IfNotPresent volumeMounts: - name: client-certs diff --git a/examples/example.yaml b/examples/example.yaml index a433c92af..a4226ed68 100644 --- 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.1.2 +# cockroachDBVersion: v24.2.0 image: - name: cockroachdb/cockroach:v24.1.2 + name: cockroachdb/cockroach:v24.2.0 # 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 ba7ce203a..5c0746e8d 100644 --- a/examples/smoketest.yaml +++ b/examples/smoketest.yaml @@ -39,5 +39,5 @@ spec: memory: 300Mi tlsEnabled: true image: - name: cockroachdb/cockroach:v24.1.2 + name: cockroachdb/cockroach:v24.2.0 nodes: 3 diff --git a/install/operator.yaml b/install/operator.yaml index c12872544..b6d2e6c32 100644 --- a/install/operator.yaml +++ b/install/operator.yaml @@ -634,6 +634,10 @@ spec: value: cockroachdb/cockroach:v23.1.22 - name: RELATED_IMAGE_COCKROACH_v23_1_23 value: cockroachdb/cockroach:v23.1.23 + - name: RELATED_IMAGE_COCKROACH_v23_1_24 + value: cockroachdb/cockroach:v23.1.24 + - name: RELATED_IMAGE_COCKROACH_v23_1_25 + value: cockroachdb/cockroach:v23.1.25 - name: RELATED_IMAGE_COCKROACH_v23_2_0 value: cockroachdb/cockroach:v23.2.0 - name: RELATED_IMAGE_COCKROACH_v23_2_1 @@ -650,12 +654,18 @@ spec: value: cockroachdb/cockroach:v23.2.7 - name: RELATED_IMAGE_COCKROACH_v23_2_8 value: cockroachdb/cockroach:v23.2.8 + - name: RELATED_IMAGE_COCKROACH_v23_2_9 + value: cockroachdb/cockroach:v23.2.9 - name: RELATED_IMAGE_COCKROACH_v24_1_0 value: cockroachdb/cockroach:v24.1.0 - name: RELATED_IMAGE_COCKROACH_v24_1_1 value: cockroachdb/cockroach:v24.1.1 - name: RELATED_IMAGE_COCKROACH_v24_1_2 value: cockroachdb/cockroach:v24.1.2 + - name: RELATED_IMAGE_COCKROACH_v24_1_3 + value: cockroachdb/cockroach:v24.1.3 + - name: RELATED_IMAGE_COCKROACH_v24_2_0 + value: cockroachdb/cockroach:v24.2.0 - name: OPERATOR_NAME value: cockroachdb - name: POD_NAME