From e61bde9ca6946366c3f2dadbba8303120cb05642 Mon Sep 17 00:00:00 2001 From: CRL Release bot Date: Tue, 4 Jun 2024 00:07:17 +0000 Subject: [PATCH] Update supported CRDB versions. --- config/manager/patches/image.yaml | 12 ++++++++++++ ...ckroach-operator.clusterserviceversion.yaml | 12 ++++++++++++ config/manifests/patches/deployment_patch.yaml | 12 ++++++++++++ config/samples/crdb-tls-example.yaml | 2 +- crdb-versions.yaml | 18 ++++++++++++++++++ examples/client-secure-operator.yaml | 2 +- examples/example.yaml | 4 ++-- examples/smoketest.yaml | 2 +- install/operator.yaml | 12 ++++++++++++ 9 files changed, 71 insertions(+), 5 deletions(-) diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml index b63435670..78216aaa4 100644 --- a/config/manager/patches/image.yaml +++ b/config/manager/patches/image.yaml @@ -266,6 +266,14 @@ spec: value: cockroachdb/cockroach:v23.1.16 - name: RELATED_IMAGE_COCKROACH_v23_1_17 value: cockroachdb/cockroach:v23.1.17 + - name: RELATED_IMAGE_COCKROACH_v23_1_19 + value: cockroachdb/cockroach:v23.1.19 + - name: RELATED_IMAGE_COCKROACH_v23_1_20 + value: cockroachdb/cockroach:v23.1.20 + - name: RELATED_IMAGE_COCKROACH_v23_1_21 + value: cockroachdb/cockroach:v23.1.21 + - name: RELATED_IMAGE_COCKROACH_v23_1_22 + value: cockroachdb/cockroach:v23.1.22 - name: RELATED_IMAGE_COCKROACH_v23_2_0 value: cockroachdb/cockroach:v23.2.0 - name: RELATED_IMAGE_COCKROACH_v23_2_1 @@ -274,3 +282,7 @@ spec: value: cockroachdb/cockroach:v23.2.2 - name: RELATED_IMAGE_COCKROACH_v23_2_3 value: cockroachdb/cockroach:v23.2.3 + - name: RELATED_IMAGE_COCKROACH_v23_2_5 + value: cockroachdb/cockroach:v23.2.5 + - name: RELATED_IMAGE_COCKROACH_v24_1_0 + value: cockroachdb/cockroach:v24.1.0 diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml index 7d3226487..6cbf218ba 100644 --- a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml @@ -439,6 +439,14 @@ spec: 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:f438fbbf9c87ca0d54c170e2c5105b1e265182e1c2ede48adea370e2be9dc895 + name: RELATED_IMAGE_COCKROACH_v23_1_19 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:bc1ab77a9537ccf236ce6dc370940dfedcfaa91b6e3db37bf2d5eade7ff84708 + name: RELATED_IMAGE_COCKROACH_v23_1_20 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f53b07212320c6939d3bb4ddd4e6a0bce311ab5b63858eb1a8728531f0dbd510 + name: RELATED_IMAGE_COCKROACH_v23_1_21 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:bd336715332f776a72aaf5c3ca52e62dd53a9e8521c1feb6e135cc868d694a39 + name: RELATED_IMAGE_COCKROACH_v23_1_22 - 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 @@ -447,6 +455,10 @@ spec: name: RELATED_IMAGE_COCKROACH_v23_2_2 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8443c15eb1653dd9e5ec7aad54d4b8b092d41a0977e42b76e372e5e21280746e name: RELATED_IMAGE_COCKROACH_v23_2_3 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:4635550222775fc75737be5e5c0359303e3a23c4d1e1c296d7408cd15ad94aad + name: RELATED_IMAGE_COCKROACH_v23_2_5 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90 + name: RELATED_IMAGE_COCKROACH_v24_1_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 cc0a4c99f..56641f62c 100644 --- a/config/manifests/patches/deployment_patch.yaml +++ b/config/manifests/patches/deployment_patch.yaml @@ -275,6 +275,14 @@ spec: 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_1_19 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f438fbbf9c87ca0d54c170e2c5105b1e265182e1c2ede48adea370e2be9dc895 + - name: RELATED_IMAGE_COCKROACH_v23_1_20 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:bc1ab77a9537ccf236ce6dc370940dfedcfaa91b6e3db37bf2d5eade7ff84708 + - name: RELATED_IMAGE_COCKROACH_v23_1_21 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f53b07212320c6939d3bb4ddd4e6a0bce311ab5b63858eb1a8728531f0dbd510 + - name: RELATED_IMAGE_COCKROACH_v23_1_22 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:bd336715332f776a72aaf5c3ca52e62dd53a9e8521c1feb6e135cc868d694a39 - name: RELATED_IMAGE_COCKROACH_v23_2_0 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:56109e57ee0379cf48644bcf8226a9238e01139cacc5499002c99f973f121911 - name: RELATED_IMAGE_COCKROACH_v23_2_1 @@ -283,4 +291,8 @@ spec: 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 + - name: RELATED_IMAGE_COCKROACH_v23_2_5 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:4635550222775fc75737be5e5c0359303e3a23c4d1e1c296d7408cd15ad94aad + - name: RELATED_IMAGE_COCKROACH_v24_1_0 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90 image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER diff --git a/config/samples/crdb-tls-example.yaml b/config/samples/crdb-tls-example.yaml index 94237e67a..bfaa53f82 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.3 + cockroachDBVersion: v24.1.0 dataStore: pvc: spec: diff --git a/crdb-versions.yaml b/crdb-versions.yaml index ec10adc92..eaf83022d 100644 --- a/crdb-versions.yaml +++ b/crdb-versions.yaml @@ -382,6 +382,18 @@ CrdbVersions: - image: cockroachdb/cockroach:v23.1.17 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:44a0f40a6c46ba08297b482f3d96defe87b181c944803e5381c9acc42cabf97f tag: v23.1.17 +- image: cockroachdb/cockroach:v23.1.19 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f438fbbf9c87ca0d54c170e2c5105b1e265182e1c2ede48adea370e2be9dc895 + tag: v23.1.19 +- image: cockroachdb/cockroach:v23.1.20 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:bc1ab77a9537ccf236ce6dc370940dfedcfaa91b6e3db37bf2d5eade7ff84708 + tag: v23.1.20 +- image: cockroachdb/cockroach:v23.1.21 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f53b07212320c6939d3bb4ddd4e6a0bce311ab5b63858eb1a8728531f0dbd510 + tag: v23.1.21 +- image: cockroachdb/cockroach:v23.1.22 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:bd336715332f776a72aaf5c3ca52e62dd53a9e8521c1feb6e135cc868d694a39 + tag: v23.1.22 - image: cockroachdb/cockroach:v23.2.0 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:56109e57ee0379cf48644bcf8226a9238e01139cacc5499002c99f973f121911 tag: v23.2.0 @@ -394,3 +406,9 @@ CrdbVersions: - image: cockroachdb/cockroach:v23.2.3 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8443c15eb1653dd9e5ec7aad54d4b8b092d41a0977e42b76e372e5e21280746e tag: v23.2.3 +- image: cockroachdb/cockroach:v23.2.5 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:4635550222775fc75737be5e5c0359303e3a23c4d1e1c296d7408cd15ad94aad + tag: v23.2.5 +- image: cockroachdb/cockroach:v24.1.0 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90 + tag: v24.1.0 diff --git a/examples/client-secure-operator.yaml b/examples/client-secure-operator.yaml index d5104d7a7..4c6b0ead6 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.3 + image: cockroachdb/cockroach:v24.1.0 imagePullPolicy: IfNotPresent volumeMounts: - name: client-certs diff --git a/examples/example.yaml b/examples/example.yaml index c19a191ca..4da71c022 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.3 +# cockroachDBVersion: v24.1.0 image: - name: cockroachdb/cockroach:v23.2.3 + name: cockroachdb/cockroach:v24.1.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 920b49710..7d522bc9d 100644 --- a/examples/smoketest.yaml +++ b/examples/smoketest.yaml @@ -39,5 +39,5 @@ spec: memory: 300Mi tlsEnabled: true image: - name: cockroachdb/cockroach:v23.2.3 + name: cockroachdb/cockroach:v24.1.0 nodes: 3 diff --git a/install/operator.yaml b/install/operator.yaml index affc659cf..ac38e2cfd 100644 --- a/install/operator.yaml +++ b/install/operator.yaml @@ -624,6 +624,14 @@ spec: value: cockroachdb/cockroach:v23.1.16 - name: RELATED_IMAGE_COCKROACH_v23_1_17 value: cockroachdb/cockroach:v23.1.17 + - name: RELATED_IMAGE_COCKROACH_v23_1_19 + value: cockroachdb/cockroach:v23.1.19 + - name: RELATED_IMAGE_COCKROACH_v23_1_20 + value: cockroachdb/cockroach:v23.1.20 + - name: RELATED_IMAGE_COCKROACH_v23_1_21 + value: cockroachdb/cockroach:v23.1.21 + - name: RELATED_IMAGE_COCKROACH_v23_1_22 + value: cockroachdb/cockroach:v23.1.22 - name: RELATED_IMAGE_COCKROACH_v23_2_0 value: cockroachdb/cockroach:v23.2.0 - name: RELATED_IMAGE_COCKROACH_v23_2_1 @@ -632,6 +640,10 @@ spec: value: cockroachdb/cockroach:v23.2.2 - name: RELATED_IMAGE_COCKROACH_v23_2_3 value: cockroachdb/cockroach:v23.2.3 + - name: RELATED_IMAGE_COCKROACH_v23_2_5 + value: cockroachdb/cockroach:v23.2.5 + - name: RELATED_IMAGE_COCKROACH_v24_1_0 + value: cockroachdb/cockroach:v24.1.0 - name: OPERATOR_NAME value: cockroachdb - name: POD_NAME