From f3baba0fa241d14b746bc06e15af3d620159cf26 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 11:02:12 -0400 Subject: [PATCH] Update supported CRDB versions. (#1048) Co-authored-by: CRL Release bot --- config/manager/patches/image.yaml | 2 ++ .../bases/cockroach-operator.clusterserviceversion.yaml | 2 ++ config/manifests/patches/deployment_patch.yaml | 2 ++ config/samples/crdb-tls-example.yaml | 2 +- crdb-versions.yaml | 3 +++ examples/client-secure-operator.yaml | 2 +- examples/example.yaml | 4 ++-- examples/smoketest.yaml | 2 +- install/operator.yaml | 2 ++ 9 files changed, 16 insertions(+), 5 deletions(-) diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml index 59e42c74c..607e37443 100644 --- a/config/manager/patches/image.yaml +++ b/config/manager/patches/image.yaml @@ -322,3 +322,5 @@ spec: value: cockroachdb/cockroach:v24.2.0 - name: RELATED_IMAGE_COCKROACH_v24_2_2 value: cockroachdb/cockroach:v24.2.2 + - name: RELATED_IMAGE_COCKROACH_v24_2_3 + value: cockroachdb/cockroach:v24.2.3 diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml index 2c168e21d..754cecfb0 100644 --- a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml @@ -495,6 +495,8 @@ spec: name: RELATED_IMAGE_COCKROACH_v24_2_0 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:08cec123813304ab03bd66d72a09949667a874a42320bedafda391ebcdb2e56c name: RELATED_IMAGE_COCKROACH_v24_2_2 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acc083f7dde1fbc557d858d03fc26b68b2056997fc1a457e4695650214d5b303 + name: RELATED_IMAGE_COCKROACH_v24_2_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 1fa795c26..e2d3733cc 100644 --- a/config/manifests/patches/deployment_patch.yaml +++ b/config/manifests/patches/deployment_patch.yaml @@ -331,4 +331,6 @@ spec: value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024 - name: RELATED_IMAGE_COCKROACH_v24_2_2 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:08cec123813304ab03bd66d72a09949667a874a42320bedafda391ebcdb2e56c + - name: RELATED_IMAGE_COCKROACH_v24_2_3 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acc083f7dde1fbc557d858d03fc26b68b2056997fc1a457e4695650214d5b303 image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER diff --git a/config/samples/crdb-tls-example.yaml b/config/samples/crdb-tls-example.yaml index 5fe450414..29c0c65d2 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.2.2 + cockroachDBVersion: v24.2.3 dataStore: pvc: spec: diff --git a/crdb-versions.yaml b/crdb-versions.yaml index 76e7d3eef..eca21ba42 100644 --- a/crdb-versions.yaml +++ b/crdb-versions.yaml @@ -466,3 +466,6 @@ CrdbVersions: - image: cockroachdb/cockroach:v24.2.2 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:08cec123813304ab03bd66d72a09949667a874a42320bedafda391ebcdb2e56c tag: v24.2.2 +- image: cockroachdb/cockroach:v24.2.3 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acc083f7dde1fbc557d858d03fc26b68b2056997fc1a457e4695650214d5b303 + tag: v24.2.3 diff --git a/examples/client-secure-operator.yaml b/examples/client-secure-operator.yaml index eb8dc308f..43826aa64 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.2.2 + image: cockroachdb/cockroach:v24.2.3 imagePullPolicy: IfNotPresent volumeMounts: - name: client-certs diff --git a/examples/example.yaml b/examples/example.yaml index e23d3a83a..c75e7d5e0 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.2.2 +# cockroachDBVersion: v24.2.3 image: - name: cockroachdb/cockroach:v24.2.2 + name: cockroachdb/cockroach:v24.2.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 890d281ef..6ae1bceb8 100644 --- a/examples/smoketest.yaml +++ b/examples/smoketest.yaml @@ -39,5 +39,5 @@ spec: memory: 300Mi tlsEnabled: true image: - name: cockroachdb/cockroach:v24.2.2 + name: cockroachdb/cockroach:v24.2.3 nodes: 3 diff --git a/install/operator.yaml b/install/operator.yaml index 2a5e9502e..407e7d8a2 100644 --- a/install/operator.yaml +++ b/install/operator.yaml @@ -680,6 +680,8 @@ spec: value: cockroachdb/cockroach:v24.2.0 - name: RELATED_IMAGE_COCKROACH_v24_2_2 value: cockroachdb/cockroach:v24.2.2 + - name: RELATED_IMAGE_COCKROACH_v24_2_3 + value: cockroachdb/cockroach:v24.2.3 - name: OPERATOR_NAME value: cockroachdb - name: POD_NAME