From c6915090feb056eea68bb0576aaafab1e0425e95 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:12:55 -0500 Subject: [PATCH] Update supported CRDB versions. (#1072) 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 12cd87c06..be7930a4a 100644 --- a/config/manager/patches/image.yaml +++ b/config/manager/patches/image.yaml @@ -290,3 +290,5 @@ spec: value: cockroachdb/cockroach:v24.2.4 - name: RELATED_IMAGE_COCKROACH_v24_2_5 value: cockroachdb/cockroach:v24.2.5 + - name: RELATED_IMAGE_COCKROACH_v24_3_0 + value: cockroachdb/cockroach:v24.3.0 diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml index 2441826b1..f708a8e4c 100644 --- a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml @@ -463,6 +463,8 @@ spec: name: RELATED_IMAGE_COCKROACH_v24_2_4 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d4f753151af4c3d3f5a1df9014461316249a6d0621b8fba5c4430307b3355251 name: RELATED_IMAGE_COCKROACH_v24_2_5 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b06bd7f3802e8fa2af14bb0b07804cad4cc0fbbc97da18d09a9106bf074ed6d8 + name: RELATED_IMAGE_COCKROACH_v24_3_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 35c7dbdf6..00054cff5 100644 --- a/config/manifests/patches/deployment_patch.yaml +++ b/config/manifests/patches/deployment_patch.yaml @@ -299,4 +299,6 @@ spec: value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:226d7f1c3f0d70ac6532ad9490bebcdef44a40959b6aa7c11b0f2d1383a46217 - name: RELATED_IMAGE_COCKROACH_v24_2_5 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d4f753151af4c3d3f5a1df9014461316249a6d0621b8fba5c4430307b3355251 + - name: RELATED_IMAGE_COCKROACH_v24_3_0 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b06bd7f3802e8fa2af14bb0b07804cad4cc0fbbc97da18d09a9106bf074ed6d8 image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER diff --git a/config/samples/crdb-tls-example.yaml b/config/samples/crdb-tls-example.yaml index ed495f268..3ee8523d3 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.5 + cockroachDBVersion: v24.3.0 dataStore: pvc: spec: diff --git a/crdb-versions.yaml b/crdb-versions.yaml index 1a60abff4..1001d169c 100644 --- a/crdb-versions.yaml +++ b/crdb-versions.yaml @@ -418,3 +418,6 @@ CrdbVersions: - image: cockroachdb/cockroach:v24.2.5 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d4f753151af4c3d3f5a1df9014461316249a6d0621b8fba5c4430307b3355251 tag: v24.2.5 +- image: cockroachdb/cockroach:v24.3.0 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b06bd7f3802e8fa2af14bb0b07804cad4cc0fbbc97da18d09a9106bf074ed6d8 + tag: v24.3.0 diff --git a/examples/client-secure-operator.yaml b/examples/client-secure-operator.yaml index 20bad2979..ed86429cb 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.5 + image: cockroachdb/cockroach:v24.3.0 imagePullPolicy: IfNotPresent volumeMounts: - name: client-certs diff --git a/examples/example.yaml b/examples/example.yaml index e8fdef7b8..daede638f 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.5 +# cockroachDBVersion: v24.3.0 image: - name: cockroachdb/cockroach:v24.2.5 + name: cockroachdb/cockroach:v24.3.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 b9ef64144..f4dd77eea 100644 --- a/examples/smoketest.yaml +++ b/examples/smoketest.yaml @@ -39,5 +39,5 @@ spec: memory: 300Mi tlsEnabled: true image: - name: cockroachdb/cockroach:v24.2.5 + name: cockroachdb/cockroach:v24.3.0 nodes: 3 diff --git a/install/operator.yaml b/install/operator.yaml index 8235e3701..8de72f8b3 100644 --- a/install/operator.yaml +++ b/install/operator.yaml @@ -649,6 +649,8 @@ spec: value: cockroachdb/cockroach:v24.2.4 - name: RELATED_IMAGE_COCKROACH_v24_2_5 value: cockroachdb/cockroach:v24.2.5 + - name: RELATED_IMAGE_COCKROACH_v24_3_0 + value: cockroachdb/cockroach:v24.3.0 - name: OPERATOR_NAME value: cockroachdb - name: POD_NAME