diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml index 2556811ce..3c541c849 100644 --- a/config/manager/patches/image.yaml +++ b/config/manager/patches/image.yaml @@ -370,11 +370,5 @@ spec: value: cockroachdb/cockroach:v25.2.0 - name: RELATED_IMAGE_COCKROACH_v25_2_1 value: cockroachdb/cockroach:v25.2.1 - - name: RELATED_IMAGE_COCKROACH_v25_2_10 - value: cockroachdb/cockroach:v25.2.10 - - name: RELATED_IMAGE_COCKROACH_v25_2_11 - value: cockroachdb/cockroach:v25.2.11 - - name: RELATED_IMAGE_COCKROACH_v25_2_12 - value: cockroachdb/cockroach:v25.2.12 - - name: RELATED_IMAGE_COCKROACH_v26_2_1 - value: cockroachdb/cockroach:v26.2.1 + - name: RELATED_IMAGE_COCKROACH_v26_2_2 + value: cockroachdb/cockroach:v26.2.2 diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml index fd32cb638..f2a4b7e91 100644 --- a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml @@ -543,14 +543,8 @@ spec: name: RELATED_IMAGE_COCKROACH_v25_2_0 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3b78a4d3864e16d270979d9d7756012abf09e6cdb7f1eb4832f6497c26281099 name: RELATED_IMAGE_COCKROACH_v25_2_1 - - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:51a717edb6cb122b933d30bbddda8e65dd6312f521ccacacf4b014437d3128b9 - name: RELATED_IMAGE_COCKROACH_v25_2_10 - - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b80d4524cdd3e2d1a0cfb76cb7d7f89d84683e06d2b8ce26b8d36429f2866f5c - name: RELATED_IMAGE_COCKROACH_v25_2_11 - - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6164369a5e863c42f6c43c76612d9221419c01ee17fcf146298df0993b60a441 - name: RELATED_IMAGE_COCKROACH_v25_2_12 - - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:25ebcaf1401f97f35796cad9dc5a9f722786d6c09cc920642e74a18b0bc40751 - name: RELATED_IMAGE_COCKROACH_v26_2_1 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1842be1193ef96ed27c14b995d59342fe0a80f9d653acf335f1c67791905df72 + name: RELATED_IMAGE_COCKROACH_v26_2_2 - 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 7e13aef46..3439ccb82 100644 --- a/config/manifests/patches/deployment_patch.yaml +++ b/config/manifests/patches/deployment_patch.yaml @@ -379,14 +379,8 @@ spec: value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c74cf927a2b2c5098ad74ad0880996f8b042186a9911d888a231ef5b9e2a0715 - name: RELATED_IMAGE_COCKROACH_v25_2_1 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3b78a4d3864e16d270979d9d7756012abf09e6cdb7f1eb4832f6497c26281099 - - name: RELATED_IMAGE_COCKROACH_v25_2_10 - value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:51a717edb6cb122b933d30bbddda8e65dd6312f521ccacacf4b014437d3128b9 - - name: RELATED_IMAGE_COCKROACH_v25_2_11 - value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b80d4524cdd3e2d1a0cfb76cb7d7f89d84683e06d2b8ce26b8d36429f2866f5c - - name: RELATED_IMAGE_COCKROACH_v25_2_12 - value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6164369a5e863c42f6c43c76612d9221419c01ee17fcf146298df0993b60a441 - - name: RELATED_IMAGE_COCKROACH_v26_2_1 - value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:25ebcaf1401f97f35796cad9dc5a9f722786d6c09cc920642e74a18b0bc40751 + - name: RELATED_IMAGE_COCKROACH_v26_2_2 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1842be1193ef96ed27c14b995d59342fe0a80f9d653acf335f1c67791905df72 - name: RELATED_IMAGE_COCKROACH_OPERATOR value: RH_COCKROACH_OP_IMAGE_PLACEHOLDER image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER diff --git a/config/samples/crdb-tls-example.yaml b/config/samples/crdb-tls-example.yaml index 8f7c29d8c..ff03f1304 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: v26.2.1 + cockroachDBVersion: v26.2.2 dataStore: pvc: spec: diff --git a/crdb-versions.yaml b/crdb-versions.yaml index 97ee1f787..453f8f4d5 100644 --- a/crdb-versions.yaml +++ b/crdb-versions.yaml @@ -538,15 +538,6 @@ CrdbVersions: - image: cockroachdb/cockroach:v25.2.1 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3b78a4d3864e16d270979d9d7756012abf09e6cdb7f1eb4832f6497c26281099 tag: v25.2.1 -- image: cockroachdb/cockroach:v25.2.10 - redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:51a717edb6cb122b933d30bbddda8e65dd6312f521ccacacf4b014437d3128b9 - tag: v25.2.10 -- image: cockroachdb/cockroach:v25.2.11 - redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b80d4524cdd3e2d1a0cfb76cb7d7f89d84683e06d2b8ce26b8d36429f2866f5c - tag: v25.2.11 -- image: cockroachdb/cockroach:v25.2.12 - redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6164369a5e863c42f6c43c76612d9221419c01ee17fcf146298df0993b60a441 - tag: v25.2.12 -- image: cockroachdb/cockroach:v26.2.1 - redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:25ebcaf1401f97f35796cad9dc5a9f722786d6c09cc920642e74a18b0bc40751 - tag: v26.2.1 +- image: cockroachdb/cockroach:v26.2.2 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1842be1193ef96ed27c14b995d59342fe0a80f9d653acf335f1c67791905df72 + tag: v26.2.2 diff --git a/examples/client-secure-operator.yaml b/examples/client-secure-operator.yaml index 6bcc64382..f75dffaec 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:v26.2.1 + image: cockroachdb/cockroach:v26.2.2 imagePullPolicy: IfNotPresent volumeMounts: - name: client-certs diff --git a/examples/example.yaml b/examples/example.yaml index 96a07933c..4eb6ea25d 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: v26.2.1 +# cockroachDBVersion: v26.2.2 image: - name: cockroachdb/cockroach:v26.2.1 + name: cockroachdb/cockroach:v26.2.2 # 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 347fb8f99..c13562175 100644 --- a/examples/smoketest.yaml +++ b/examples/smoketest.yaml @@ -39,5 +39,5 @@ spec: memory: 300Mi tlsEnabled: true image: - name: cockroachdb/cockroach:v26.2.1 + name: cockroachdb/cockroach:v26.2.2 nodes: 3 diff --git a/install/operator.yaml b/install/operator.yaml index 94ad1e7e0..0f17e204c 100644 --- a/install/operator.yaml +++ b/install/operator.yaml @@ -729,14 +729,8 @@ spec: value: cockroachdb/cockroach:v25.2.0 - name: RELATED_IMAGE_COCKROACH_v25_2_1 value: cockroachdb/cockroach:v25.2.1 - - name: RELATED_IMAGE_COCKROACH_v25_2_10 - value: cockroachdb/cockroach:v25.2.10 - - name: RELATED_IMAGE_COCKROACH_v25_2_11 - value: cockroachdb/cockroach:v25.2.11 - - name: RELATED_IMAGE_COCKROACH_v25_2_12 - value: cockroachdb/cockroach:v25.2.12 - - name: RELATED_IMAGE_COCKROACH_v26_2_1 - value: cockroachdb/cockroach:v26.2.1 + - name: RELATED_IMAGE_COCKROACH_v26_2_2 + value: cockroachdb/cockroach:v26.2.2 - name: OPERATOR_NAME value: cockroachdb - name: POD_NAME