From 3ff4c3dbb46101a5ff4fd1f15a00532b753a3014 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 00:52:18 +0530 Subject: [PATCH] Update supported CRDB versions. (#1028) Co-authored-by: CRL Release bot --- config/manager/patches/image.yaml | 4 ++++ .../bases/cockroach-operator.clusterserviceversion.yaml | 4 ++++ config/manifests/patches/deployment_patch.yaml | 4 ++++ config/samples/crdb-tls-example.yaml | 2 +- crdb-versions.yaml | 6 ++++++ examples/client-secure-operator.yaml | 2 +- examples/example.yaml | 4 ++-- examples/smoketest.yaml | 2 +- install/operator.yaml | 4 ++++ 9 files changed, 27 insertions(+), 5 deletions(-) diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml index 66fb63e62..acb91fffb 100644 --- a/config/manager/patches/image.yaml +++ b/config/manager/patches/image.yaml @@ -264,9 +264,13 @@ spec: value: cockroachdb/cockroach:v23.1.15 - name: RELATED_IMAGE_COCKROACH_v23_1_16 value: cockroachdb/cockroach:v23.1.16 + - name: RELATED_IMAGE_COCKROACH_v23_1_17 + value: cockroachdb/cockroach:v23.1.17 - name: RELATED_IMAGE_COCKROACH_v23_2_0 value: cockroachdb/cockroach:v23.2.0 - name: RELATED_IMAGE_COCKROACH_v23_2_1 value: cockroachdb/cockroach:v23.2.1 - name: RELATED_IMAGE_COCKROACH_v23_2_2 value: cockroachdb/cockroach:v23.2.2 + - name: RELATED_IMAGE_COCKROACH_v23_2_3 + value: cockroachdb/cockroach:v23.2.3 diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml index 5ba13a2c3..7d3226487 100644 --- a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml @@ -437,12 +437,16 @@ spec: name: RELATED_IMAGE_COCKROACH_v23_1_15 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fe4a40006d1e8439423de1417cc9bc55716d790b882485074bb2a5ec68d7d1ad name: RELATED_IMAGE_COCKROACH_v23_1_16 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:44a0f40a6c46ba08297b482f3d96defe87b181c944803e5381c9acc42cabf97f + name: RELATED_IMAGE_COCKROACH_v23_1_17 - 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 name: RELATED_IMAGE_COCKROACH_v23_2_1 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1304d7f871a95c8b087bad1b548217562792edc66c8fe07c621e05242b8cd53e name: RELATED_IMAGE_COCKROACH_v23_2_2 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8443c15eb1653dd9e5ec7aad54d4b8b092d41a0977e42b76e372e5e21280746e + name: RELATED_IMAGE_COCKROACH_v23_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 40c01a250..cc0a4c99f 100644 --- a/config/manifests/patches/deployment_patch.yaml +++ b/config/manifests/patches/deployment_patch.yaml @@ -273,10 +273,14 @@ spec: value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:31b161f9bf9028a1a62cd2eef6abda01257d8889bdc3159822642549a75e3429 - name: RELATED_IMAGE_COCKROACH_v23_1_16 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fe4a40006d1e8439423de1417cc9bc55716d790b882485074bb2a5ec68d7d1ad + - name: RELATED_IMAGE_COCKROACH_v23_1_17 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:44a0f40a6c46ba08297b482f3d96defe87b181c944803e5381c9acc42cabf97f - name: RELATED_IMAGE_COCKROACH_v23_2_0 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:56109e57ee0379cf48644bcf8226a9238e01139cacc5499002c99f973f121911 - name: RELATED_IMAGE_COCKROACH_v23_2_1 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:4e5f7df1dc1e1db398c36d590431e7e5782897b209972d8e9e4671971c10d1b6 - name: RELATED_IMAGE_COCKROACH_v23_2_2 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1304d7f871a95c8b087bad1b548217562792edc66c8fe07c621e05242b8cd53e + - name: RELATED_IMAGE_COCKROACH_v23_2_3 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8443c15eb1653dd9e5ec7aad54d4b8b092d41a0977e42b76e372e5e21280746e image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER diff --git a/config/samples/crdb-tls-example.yaml b/config/samples/crdb-tls-example.yaml index a71046c5b..94237e67a 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: v23.2.2 + cockroachDBVersion: v23.2.3 dataStore: pvc: spec: diff --git a/crdb-versions.yaml b/crdb-versions.yaml index 48efe692b..ec10adc92 100644 --- a/crdb-versions.yaml +++ b/crdb-versions.yaml @@ -379,6 +379,9 @@ CrdbVersions: - image: cockroachdb/cockroach:v23.1.16 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fe4a40006d1e8439423de1417cc9bc55716d790b882485074bb2a5ec68d7d1ad tag: v23.1.16 +- image: cockroachdb/cockroach:v23.1.17 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:44a0f40a6c46ba08297b482f3d96defe87b181c944803e5381c9acc42cabf97f + tag: v23.1.17 - image: cockroachdb/cockroach:v23.2.0 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:56109e57ee0379cf48644bcf8226a9238e01139cacc5499002c99f973f121911 tag: v23.2.0 @@ -388,3 +391,6 @@ CrdbVersions: - image: cockroachdb/cockroach:v23.2.2 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1304d7f871a95c8b087bad1b548217562792edc66c8fe07c621e05242b8cd53e tag: v23.2.2 +- image: cockroachdb/cockroach:v23.2.3 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8443c15eb1653dd9e5ec7aad54d4b8b092d41a0977e42b76e372e5e21280746e + tag: v23.2.3 diff --git a/examples/client-secure-operator.yaml b/examples/client-secure-operator.yaml index f277bb4bb..d5104d7a7 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:v23.2.2 + image: cockroachdb/cockroach:v23.2.3 imagePullPolicy: IfNotPresent volumeMounts: - name: client-certs diff --git a/examples/example.yaml b/examples/example.yaml index 87ac77c92..c19a191ca 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: v23.2.2 +# cockroachDBVersion: v23.2.3 image: - name: cockroachdb/cockroach:v23.2.2 + name: cockroachdb/cockroach:v23.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 fee2c0077..920b49710 100644 --- a/examples/smoketest.yaml +++ b/examples/smoketest.yaml @@ -39,5 +39,5 @@ spec: memory: 300Mi tlsEnabled: true image: - name: cockroachdb/cockroach:v23.2.2 + name: cockroachdb/cockroach:v23.2.3 nodes: 3 diff --git a/install/operator.yaml b/install/operator.yaml index e09cc0bf5..b2fe28035 100644 --- a/install/operator.yaml +++ b/install/operator.yaml @@ -622,12 +622,16 @@ spec: value: cockroachdb/cockroach:v23.1.15 - name: RELATED_IMAGE_COCKROACH_v23_1_16 value: cockroachdb/cockroach:v23.1.16 + - name: RELATED_IMAGE_COCKROACH_v23_1_17 + value: cockroachdb/cockroach:v23.1.17 - name: RELATED_IMAGE_COCKROACH_v23_2_0 value: cockroachdb/cockroach:v23.2.0 - name: RELATED_IMAGE_COCKROACH_v23_2_1 value: cockroachdb/cockroach:v23.2.1 - name: RELATED_IMAGE_COCKROACH_v23_2_2 value: cockroachdb/cockroach:v23.2.2 + - name: RELATED_IMAGE_COCKROACH_v23_2_3 + value: cockroachdb/cockroach:v23.2.3 - name: OPERATOR_NAME value: cockroachdb - name: POD_NAME