From fddacd466ebcb430db340b164a39d90d3c0a6d17 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 09:27:56 -0500 Subject: [PATCH] Update supported CRDB versions. (#1080) Co-authored-by: CRL Release bot --- config/manager/patches/image.yaml | 6 ++++++ .../bases/cockroach-operator.clusterserviceversion.yaml | 6 ++++++ config/manifests/patches/deployment_patch.yaml | 6 ++++++ config/samples/crdb-tls-example.yaml | 2 +- crdb-versions.yaml | 9 +++++++++ examples/client-secure-operator.yaml | 2 +- examples/example.yaml | 4 ++-- examples/smoketest.yaml | 2 +- install/operator.yaml | 6 ++++++ 9 files changed, 38 insertions(+), 5 deletions(-) diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml index 25834cb87..1aba4c5c3 100644 --- a/config/manager/patches/image.yaml +++ b/config/manager/patches/image.yaml @@ -290,6 +290,8 @@ spec: value: cockroachdb/cockroach:v24.1.8 - name: RELATED_IMAGE_COCKROACH_v24_1_10 value: cockroachdb/cockroach:v24.1.10 + - name: RELATED_IMAGE_COCKROACH_v24_1_11 + value: cockroachdb/cockroach:v24.1.11 - name: RELATED_IMAGE_COCKROACH_v24_2_0 value: cockroachdb/cockroach:v24.2.0 - name: RELATED_IMAGE_COCKROACH_v24_2_2 @@ -304,9 +306,13 @@ spec: value: cockroachdb/cockroach:v24.2.6 - name: RELATED_IMAGE_COCKROACH_v24_2_8 value: cockroachdb/cockroach:v24.2.8 + - name: RELATED_IMAGE_COCKROACH_v24_2_9 + value: cockroachdb/cockroach:v24.2.9 - 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: RELATED_IMAGE_COCKROACH_v24_3_4 + value: cockroachdb/cockroach:v24.3.4 diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml index e5c2b4af6..8c5b23dbf 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_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:e82684b828256b3c2814930210031b3b70bc818514d4359a25f87ffdbf22be6e + name: RELATED_IMAGE_COCKROACH_v24_1_11 - 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 @@ -477,12 +479,16 @@ spec: 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:cf001173bbf00cdf443b8d64a3ad724389f1cf83e3628d0b609019c8cddad35a + name: RELATED_IMAGE_COCKROACH_v24_2_9 - 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: registry.connect.redhat.com/cockroachdb/cockroach@sha256:858dc82977b3c9e989a3a20626671b0c67c834c97132094a9212bb227ab55929 + name: RELATED_IMAGE_COCKROACH_v24_3_4 - 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 63d124472..48dc734de 100644 --- a/config/manifests/patches/deployment_patch.yaml +++ b/config/manifests/patches/deployment_patch.yaml @@ -299,6 +299,8 @@ spec: 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_1_11 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e82684b828256b3c2814930210031b3b70bc818514d4359a25f87ffdbf22be6e - name: RELATED_IMAGE_COCKROACH_v24_2_0 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024 - name: RELATED_IMAGE_COCKROACH_v24_2_2 @@ -313,10 +315,14 @@ spec: 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_2_9 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cf001173bbf00cdf443b8d64a3ad724389f1cf83e3628d0b609019c8cddad35a - 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 + - name: RELATED_IMAGE_COCKROACH_v24_3_4 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:858dc82977b3c9e989a3a20626671b0c67c834c97132094a9212bb227ab55929 image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER diff --git a/config/samples/crdb-tls-example.yaml b/config/samples/crdb-tls-example.yaml index e1c481ebd..b5f54a52b 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.3.3 + cockroachDBVersion: v24.3.4 dataStore: pvc: spec: diff --git a/crdb-versions.yaml b/crdb-versions.yaml index 1cf438062..31eff1a75 100644 --- a/crdb-versions.yaml +++ b/crdb-versions.yaml @@ -418,6 +418,9 @@ CrdbVersions: - image: cockroachdb/cockroach:v24.1.10 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:743cda1eda6e273c798e3405a9a97e07dd6aa5ad4d5a52789be3b0f39a32a039 tag: v24.1.10 +- image: cockroachdb/cockroach:v24.1.11 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e82684b828256b3c2814930210031b3b70bc818514d4359a25f87ffdbf22be6e + tag: v24.1.11 - image: cockroachdb/cockroach:v24.2.0 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024 tag: v24.2.0 @@ -439,6 +442,9 @@ CrdbVersions: - image: cockroachdb/cockroach:v24.2.8 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:db07461824e73410456ef540b0bce3c7fe550aa67a73d6174300ca74b8f75276 tag: v24.2.8 +- image: cockroachdb/cockroach:v24.2.9 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cf001173bbf00cdf443b8d64a3ad724389f1cf83e3628d0b609019c8cddad35a + tag: v24.2.9 - image: cockroachdb/cockroach:v24.3.0 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b06bd7f3802e8fa2af14bb0b07804cad4cc0fbbc97da18d09a9106bf074ed6d8 tag: v24.3.0 @@ -448,3 +454,6 @@ CrdbVersions: - image: cockroachdb/cockroach:v24.3.3 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f045fe5037d44aab1a0b2209241b3931ec7cb9897cb3c6a96a9f8d5280e55dd2 tag: v24.3.3 +- image: cockroachdb/cockroach:v24.3.4 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:858dc82977b3c9e989a3a20626671b0c67c834c97132094a9212bb227ab55929 + tag: v24.3.4 diff --git a/examples/client-secure-operator.yaml b/examples/client-secure-operator.yaml index b6268ec22..9f8a8458c 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.3.3 + image: cockroachdb/cockroach:v24.3.4 imagePullPolicy: IfNotPresent volumeMounts: - name: client-certs diff --git a/examples/example.yaml b/examples/example.yaml index 9f802824f..56e6a92e6 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.3.3 +# cockroachDBVersion: v24.3.4 image: - name: cockroachdb/cockroach:v24.3.3 + name: cockroachdb/cockroach:v24.3.4 # 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 056549cba..36e0cc7e0 100644 --- a/examples/smoketest.yaml +++ b/examples/smoketest.yaml @@ -39,5 +39,5 @@ spec: memory: 300Mi tlsEnabled: true image: - name: cockroachdb/cockroach:v24.3.3 + name: cockroachdb/cockroach:v24.3.4 nodes: 3 diff --git a/install/operator.yaml b/install/operator.yaml index ec4e05ff7..84b5b5015 100644 --- a/install/operator.yaml +++ b/install/operator.yaml @@ -651,6 +651,8 @@ spec: value: cockroachdb/cockroach:v24.1.8 - name: RELATED_IMAGE_COCKROACH_v24_1_10 value: cockroachdb/cockroach:v24.1.10 + - name: RELATED_IMAGE_COCKROACH_v24_1_11 + value: cockroachdb/cockroach:v24.1.11 - name: RELATED_IMAGE_COCKROACH_v24_2_0 value: cockroachdb/cockroach:v24.2.0 - name: RELATED_IMAGE_COCKROACH_v24_2_2 @@ -665,12 +667,16 @@ spec: value: cockroachdb/cockroach:v24.2.6 - name: RELATED_IMAGE_COCKROACH_v24_2_8 value: cockroachdb/cockroach:v24.2.8 + - name: RELATED_IMAGE_COCKROACH_v24_2_9 + value: cockroachdb/cockroach:v24.2.9 - 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: RELATED_IMAGE_COCKROACH_v24_3_4 + value: cockroachdb/cockroach:v24.3.4 - name: OPERATOR_NAME value: cockroachdb - name: POD_NAME