Skip to content

Commit bdc108b

Browse files
authored
Updates the display name for the redhat catalog listing and supports the latest version of the cockroachdb image (#1139)
1 parent 563c438 commit bdc108b

File tree

10 files changed

+33
-33
lines changed

10 files changed

+33
-33
lines changed

config/manager/patches/image.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,8 @@ spec:
316316
value: cockroachdb/cockroach:v24.3.22
317317
- name: RELATED_IMAGE_COCKROACH_v24_3_24
318318
value: cockroachdb/cockroach:v24.3.24
319+
- name: RELATED_IMAGE_COCKROACH_v24_3_25
320+
value: cockroachdb/cockroach:v24.3.25
319321
- name: RELATED_IMAGE_COCKROACH_v25_1_0
320322
value: cockroachdb/cockroach:v25.1.0
321323
- name: RELATED_IMAGE_COCKROACH_v25_1_1
@@ -342,7 +344,5 @@ spec:
342344
value: cockroachdb/cockroach:v25.2.0
343345
- name: RELATED_IMAGE_COCKROACH_v25_2_1
344346
value: cockroachdb/cockroach:v25.2.1
345-
- name: RELATED_IMAGE_COCKROACH_v25_2_10
346-
value: cockroachdb/cockroach:v25.2.10
347-
- name: RELATED_IMAGE_COCKROACH_v25_4_2
348-
value: cockroachdb/cockroach:v25.4.2
347+
- name: RELATED_IMAGE_COCKROACH_v25_4_3
348+
value: cockroachdb/cockroach:v25.4.3

config/manifests/bases/cockroach-operator.clusterserviceversion.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
customresourcedefinitions:
4444
owned:
4545
- description: CrdbCluster is the CRD for the cockroachDB clusters API
46-
displayName: CoachroachDB Operator
46+
displayName: CockroachDB Public Operator
4747
kind: CrdbCluster
4848
name: crdbclusters.crdb.cockroachlabs.com.cockroachlabs.com
4949
resources:
@@ -74,7 +74,7 @@ spec:
7474
- urn:alm:descriptor:io.kubernetes.conditions
7575
version: v1alpha1
7676
- description: CrdbCluster is the CRD for the cockroachDB clusters API
77-
displayName: CockroachDB Operator
77+
displayName: CockroachDB Public Operator
7878
kind: CrdbCluster
7979
name: crdbclusters.crdb.cockroachlabs.com
8080
specDescriptors:
@@ -164,7 +164,7 @@ spec:
164164
- urn:alm:descriptor:com.tectonic.ui:hidden
165165
version: v1alpha1
166166
description: This operator launches and manages a 3+ node cluster of CockroachDB.
167-
displayName: CockroachDB Operator
167+
displayName: CockroachDB Public Operator
168168
icon:
169169
- base64data: iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA/xJREFUeNq0V9uLE1cY/85k08wk2TWyf8AGH30oI8kigrLxgsULbqC1PrR0Z3rRQh928yD2ySUKgvhg9lFFZ1ZhZR+kkdaCgiUrBSm7YYc+9KmF2AfBBzF46V6SOcfvTM7kvu5kM/1gcgIz53y/7/fdzkegSQK77y4roKhhJkMEFAgzfPgKcjnCFAv/LyhMzt8pRizoIkezq2o1wtKVQTpWGWRqJcpiuML6IAW+8qcaZda/Q8O73D0DrUeQEv6o7QcTgBguKf4QINNnkrZFw2TmxhPJ5O9PnlnXUNlkhTIVNhMGpbazGxLcPR+v/HGq1L5n/+jfqsKQGZDHkZW0QmSwIwCotFDZRvmaciyMOk8eGbiPq/X7l9EOpkbKL+PPYsOlrgC8yNeJtVhQCk7ZYZh2aUWFgNRnqwrL/XxJLvdyntQrgFvFEFcw0uXVSK/KtwRgIrFioB81hz4KGSAs47hWAu3Y+VXjfwXwefLVFANWU26Dbv4ayM3NBXOoXBcO1T65vDLVy5meY+B48rkqQ2iZp6YMH2WuFwdyze/Hz65OVcNw1Uk1he367Yew5SsDFJhRyyJWaFfO5f4VmTNRcL4JMMNXFxxI/oO013KcEjqzYYpLbEbwqu67/VbzDQAlbLJRR1j5Aw61GmBg0hcAe0b/Ul3rPUi86WR1z703at8A0OJ0S79ggQ0tIzaZbHUJpPsGgME3VgMCZo1lkj6dqHb4d/zsmoZ1wVVoCgBjfjDAmxDYYGclIE70EyIZ3+2ldRCffb/OlRuiPuToAGRFTKQ2O3/Aa7o8WhrhDSSDlZB3Ro0FwNCO2LA2jH2AirRjYD48pziVce/c2/7T8OPRYkrQX+9es0VFR8tqFCMI9LshyrL54IKsN5ir7Uk8ep3qOw3RDS0t+tqipDenHCov/HQ1pLelZMmPNCyLwOtIJxpg2QYA0lGcCKtfbMpbBvDnYsJquhG1tuXHgbz7f/5WMN9lu7OneHjI6tcFjgWHk8+8FiMYu/nOk/WeAGDqFYQbUl4BYNCkRBEp9A0AFS8IIBOeezyFCREHC34AyLuBmE6+iG/2/aGZ/+JuACKQfN8Ani7uLKFys/axNL0pYBumxWo+/XSw1DcA5yMmzQoA2hfJNxvGwpGLKylMSU3QP+vbfeDx0o5CnQUmGd8mKh1peeLcaqxeFdH6J19FC74BENbzGl9GIHEJm1GXVmyg1XHMgDKykPH9UsrlVPKVGmKhZT4ZUQXM9W1Mc2a/IWrizMfHM+dC+vBHxfJuWA8yv7TdQiZ0dw5oKrvunKD3onxLg4lZlE1CiN5S5TjtOCf8clE2ez2v59nQlW8O2mo1zIwqDqm46tgPrK2c816AAQCBW4SEJD8W2QAAAABJRU5ErkJggg==
170170
mediatype: image/png
@@ -489,6 +489,8 @@ spec:
489489
name: RELATED_IMAGE_COCKROACH_v24_3_22
490490
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:19f6fcf43bc3817a46d7990dc64fc9904e57af824e9149f34df6ddaabed9f55b
491491
name: RELATED_IMAGE_COCKROACH_v24_3_24
492+
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:77ed58e1a0fa55a37f43adba921d1286db0c2bd9fc2b4184bb782e0eb16a29e2
493+
name: RELATED_IMAGE_COCKROACH_v24_3_25
492494
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
493495
name: RELATED_IMAGE_COCKROACH_v25_1_0
494496
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd6c9b8ca82ff4f2d0fe29166d1fc9bca6439cb40907be60f4d8f1b9735de2f7
@@ -515,10 +517,8 @@ spec:
515517
name: RELATED_IMAGE_COCKROACH_v25_2_0
516518
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3b78a4d3864e16d270979d9d7756012abf09e6cdb7f1eb4832f6497c26281099
517519
name: RELATED_IMAGE_COCKROACH_v25_2_1
518-
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:51a717edb6cb122b933d30bbddda8e65dd6312f521ccacacf4b014437d3128b9
519-
name: RELATED_IMAGE_COCKROACH_v25_2_10
520-
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:edbb7d2cf46a6704182e5e7fc19e396f17e6c3a67f1e4cb374751f344f9b8e70
521-
name: RELATED_IMAGE_COCKROACH_v25_4_2
520+
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:dafe887cbc2da563bfc525bd732bee80e9eb14d5a0cf1d4391dfee75ddbee44c
521+
name: RELATED_IMAGE_COCKROACH_v25_4_3
522522
- image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
523523
name: RELATED_IMAGE_COCKROACH_OPERATOR
524524
version: 0.0.0

config/manifests/patches/deployment_patch.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,8 @@ spec:
325325
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e63df0342f7570179a53754196d297105ec80b667d5125ad2fa4e7a56c1699c7
326326
- name: RELATED_IMAGE_COCKROACH_v24_3_24
327327
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:19f6fcf43bc3817a46d7990dc64fc9904e57af824e9149f34df6ddaabed9f55b
328+
- name: RELATED_IMAGE_COCKROACH_v24_3_25
329+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:77ed58e1a0fa55a37f43adba921d1286db0c2bd9fc2b4184bb782e0eb16a29e2
328330
- name: RELATED_IMAGE_COCKROACH_v25_1_0
329331
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
330332
- name: RELATED_IMAGE_COCKROACH_v25_1_1
@@ -351,10 +353,8 @@ spec:
351353
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c74cf927a2b2c5098ad74ad0880996f8b042186a9911d888a231ef5b9e2a0715
352354
- name: RELATED_IMAGE_COCKROACH_v25_2_1
353355
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3b78a4d3864e16d270979d9d7756012abf09e6cdb7f1eb4832f6497c26281099
354-
- name: RELATED_IMAGE_COCKROACH_v25_2_10
355-
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:51a717edb6cb122b933d30bbddda8e65dd6312f521ccacacf4b014437d3128b9
356-
- name: RELATED_IMAGE_COCKROACH_v25_4_2
357-
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:edbb7d2cf46a6704182e5e7fc19e396f17e6c3a67f1e4cb374751f344f9b8e70
356+
- name: RELATED_IMAGE_COCKROACH_v25_4_3
357+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:dafe887cbc2da563bfc525bd732bee80e9eb14d5a0cf1d4391dfee75ddbee44c
358358
- name: RELATED_IMAGE_COCKROACH_OPERATOR
359359
value: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
360360
image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER

config/samples/crdb-tls-example.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ kind: CrdbCluster
1919
metadata:
2020
name: crdb-tls-example
2121
spec:
22-
cockroachDBVersion: v25.4.2
22+
cockroachDBVersion: v25.4.3
2323
dataStore:
2424
pvc:
2525
spec:

config/templates/csv.yaml.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
customresourcedefinitions:
4444
owned:
4545
- description: CrdbCluster is the CRD for the cockroachDB clusters API
46-
displayName: CoachroachDB Operator
46+
displayName: CockroachDB Public Operator
4747
kind: CrdbCluster
4848
name: crdbclusters.crdb.cockroachlabs.com.cockroachlabs.com
4949
resources:
@@ -74,7 +74,7 @@ spec:
7474
- urn:alm:descriptor:io.kubernetes.conditions
7575
version: v1alpha1
7676
- description: CrdbCluster is the CRD for the cockroachDB clusters API
77-
displayName: CockroachDB Operator
77+
displayName: CockroachDB Public Operator
7878
kind: CrdbCluster
7979
name: crdbclusters.crdb.cockroachlabs.com
8080
specDescriptors:
@@ -164,7 +164,7 @@ spec:
164164
- urn:alm:descriptor:com.tectonic.ui:hidden
165165
version: v1alpha1
166166
description: This operator launches and manages a 3+ node cluster of CockroachDB.
167-
displayName: CockroachDB Operator
167+
displayName: CockroachDB Public Operator
168168
icon:
169169
- base64data: iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA/xJREFUeNq0V9uLE1cY/85k08wk2TWyf8AGH30oI8kigrLxgsULbqC1PrR0Z3rRQh928yD2ySUKgvhg9lFFZ1ZhZR+kkdaCgiUrBSm7YYc+9KmF2AfBBzF46V6SOcfvTM7kvu5kM/1gcgIz53y/7/fdzkegSQK77y4roKhhJkMEFAgzfPgKcjnCFAv/LyhMzt8pRizoIkezq2o1wtKVQTpWGWRqJcpiuML6IAW+8qcaZda/Q8O73D0DrUeQEv6o7QcTgBguKf4QINNnkrZFw2TmxhPJ5O9PnlnXUNlkhTIVNhMGpbazGxLcPR+v/HGq1L5n/+jfqsKQGZDHkZW0QmSwIwCotFDZRvmaciyMOk8eGbiPq/X7l9EOpkbKL+PPYsOlrgC8yNeJtVhQCk7ZYZh2aUWFgNRnqwrL/XxJLvdyntQrgFvFEFcw0uXVSK/KtwRgIrFioB81hz4KGSAs47hWAu3Y+VXjfwXwefLVFANWU26Dbv4ayM3NBXOoXBcO1T65vDLVy5meY+B48rkqQ2iZp6YMH2WuFwdyze/Hz65OVcNw1Uk1he367Yew5SsDFJhRyyJWaFfO5f4VmTNRcL4JMMNXFxxI/oO013KcEjqzYYpLbEbwqu67/VbzDQAlbLJRR1j5Aw61GmBg0hcAe0b/Ul3rPUi86WR1z703at8A0OJ0S79ggQ0tIzaZbHUJpPsGgME3VgMCZo1lkj6dqHb4d/zsmoZ1wVVoCgBjfjDAmxDYYGclIE70EyIZ3+2ldRCffb/OlRuiPuToAGRFTKQ2O3/Aa7o8WhrhDSSDlZB3Ro0FwNCO2LA2jH2AirRjYD48pziVce/c2/7T8OPRYkrQX+9es0VFR8tqFCMI9LshyrL54IKsN5ir7Uk8ep3qOw3RDS0t+tqipDenHCov/HQ1pLelZMmPNCyLwOtIJxpg2QYA0lGcCKtfbMpbBvDnYsJquhG1tuXHgbz7f/5WMN9lu7OneHjI6tcFjgWHk8+8FiMYu/nOk/WeAGDqFYQbUl4BYNCkRBEp9A0AFS8IIBOeezyFCREHC34AyLuBmE6+iG/2/aGZ/+JuACKQfN8Ani7uLKFys/axNL0pYBumxWo+/XSw1DcA5yMmzQoA2hfJNxvGwpGLKylMSU3QP+vbfeDx0o5CnQUmGd8mKh1peeLcaqxeFdH6J19FC74BENbzGl9GIHEJm1GXVmyg1XHMgDKykPH9UsrlVPKVGmKhZT4ZUQXM9W1Mc2a/IWrizMfHM+dC+vBHxfJuWA8yv7TdQiZ0dw5oKrvunKD3onxLg4lZlE1CiN5S5TjtOCf8clE2ez2v59nQlW8O2mo1zIwqDqm46tgPrK2c816AAQCBW4SEJD8W2QAAAABJRU5ErkJggg==
170170
mediatype: image/png

crdb-versions.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,9 @@ CrdbVersions:
457457
- image: cockroachdb/cockroach:v24.3.24
458458
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:19f6fcf43bc3817a46d7990dc64fc9904e57af824e9149f34df6ddaabed9f55b
459459
tag: v24.3.24
460+
- image: cockroachdb/cockroach:v24.3.25
461+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:77ed58e1a0fa55a37f43adba921d1286db0c2bd9fc2b4184bb782e0eb16a29e2
462+
tag: v24.3.25
460463
- image: cockroachdb/cockroach:v25.1.0
461464
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
462465
tag: v25.1.0
@@ -496,9 +499,6 @@ CrdbVersions:
496499
- image: cockroachdb/cockroach:v25.2.1
497500
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3b78a4d3864e16d270979d9d7756012abf09e6cdb7f1eb4832f6497c26281099
498501
tag: v25.2.1
499-
- image: cockroachdb/cockroach:v25.2.10
500-
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:51a717edb6cb122b933d30bbddda8e65dd6312f521ccacacf4b014437d3128b9
501-
tag: v25.2.10
502-
- image: cockroachdb/cockroach:v25.4.2
503-
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:edbb7d2cf46a6704182e5e7fc19e396f17e6c3a67f1e4cb374751f344f9b8e70
504-
tag: v25.4.2
502+
- image: cockroachdb/cockroach:v25.4.3
503+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:dafe887cbc2da563bfc525bd732bee80e9eb14d5a0cf1d4391dfee75ddbee44c
504+
tag: v25.4.3

examples/client-secure-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
serviceAccountName: cockroachdb-sa
2424
containers:
2525
- name: cockroachdb-client-secure
26-
image: cockroachdb/cockroach:v25.4.2
26+
image: cockroachdb/cockroach:v25.4.3
2727
imagePullPolicy: IfNotPresent
2828
volumeMounts:
2929
- name: client-certs

examples/example.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ spec:
4040
memory: 8Gi
4141
tlsEnabled: true
4242
# You can set either a version of the db or a specific image name
43-
# cockroachDBVersion: v25.4.2
43+
# cockroachDBVersion: v25.4.3
4444
image:
45-
name: cockroachdb/cockroach:v25.4.2
45+
name: cockroachdb/cockroach:v25.4.3
4646
# nodes refers to the number of crdb pods that are created
4747
# via the statefulset
4848
nodes: 3

examples/smoketest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ spec:
3939
memory: 300Mi
4040
tlsEnabled: true
4141
image:
42-
name: cockroachdb/cockroach:v25.4.2
42+
name: cockroachdb/cockroach:v25.4.3
4343
nodes: 3

install/operator.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,8 @@ spec:
675675
value: cockroachdb/cockroach:v24.3.22
676676
- name: RELATED_IMAGE_COCKROACH_v24_3_24
677677
value: cockroachdb/cockroach:v24.3.24
678+
- name: RELATED_IMAGE_COCKROACH_v24_3_25
679+
value: cockroachdb/cockroach:v24.3.25
678680
- name: RELATED_IMAGE_COCKROACH_v25_1_0
679681
value: cockroachdb/cockroach:v25.1.0
680682
- name: RELATED_IMAGE_COCKROACH_v25_1_1
@@ -701,10 +703,8 @@ spec:
701703
value: cockroachdb/cockroach:v25.2.0
702704
- name: RELATED_IMAGE_COCKROACH_v25_2_1
703705
value: cockroachdb/cockroach:v25.2.1
704-
- name: RELATED_IMAGE_COCKROACH_v25_2_10
705-
value: cockroachdb/cockroach:v25.2.10
706-
- name: RELATED_IMAGE_COCKROACH_v25_4_2
707-
value: cockroachdb/cockroach:v25.4.2
706+
- name: RELATED_IMAGE_COCKROACH_v25_4_3
707+
value: cockroachdb/cockroach:v25.4.3
708708
- name: OPERATOR_NAME
709709
value: cockroachdb
710710
- name: POD_NAME

0 commit comments

Comments
 (0)