Skip to content

Commit dd940d0

Browse files
authored
Update CRDB versions (#1007)
* Update CRDB versions * Bump gopkg.in/yaml.v3 from 3.0.0-20210107192922-496545a6307b to 3.0.0
1 parent 807ae69 commit dd940d0

11 files changed

+85
-7
lines changed

config/manager/patches/image.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@ spec:
192192
value: cockroachdb/cockroach:v22.1.18
193193
- name: RELATED_IMAGE_COCKROACH_v22_1_20
194194
value: cockroachdb/cockroach:v22.1.20
195+
- name: RELATED_IMAGE_COCKROACH_v22_1_22
196+
value: cockroachdb/cockroach:v22.1.22
195197
- name: RELATED_IMAGE_COCKROACH_v22_2_0
196198
value: cockroachdb/cockroach:v22.2.0
197199
- name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -216,6 +218,8 @@ spec:
216218
value: cockroachdb/cockroach:v22.2.10
217219
- name: RELATED_IMAGE_COCKROACH_v22_2_12
218220
value: cockroachdb/cockroach:v22.2.12
221+
- name: RELATED_IMAGE_COCKROACH_v22_2_14
222+
value: cockroachdb/cockroach:v22.2.14
219223
- name: RELATED_IMAGE_COCKROACH_v23_1_0
220224
value: cockroachdb/cockroach:v23.1.0
221225
- name: RELATED_IMAGE_COCKROACH_v23_1_1
@@ -230,3 +234,13 @@ spec:
230234
value: cockroachdb/cockroach:v23.1.5
231235
- name: RELATED_IMAGE_COCKROACH_v23_1_6
232236
value: cockroachdb/cockroach:v23.1.6
237+
- name: RELATED_IMAGE_COCKROACH_v23_1_7
238+
value: cockroachdb/cockroach:v23.1.7
239+
- name: RELATED_IMAGE_COCKROACH_v23_1_8
240+
value: cockroachdb/cockroach:v23.1.8
241+
- name: RELATED_IMAGE_COCKROACH_v23_1_9
242+
value: cockroachdb/cockroach:v23.1.9
243+
- name: RELATED_IMAGE_COCKROACH_v23_1_10
244+
value: cockroachdb/cockroach:v23.1.10
245+
- name: RELATED_IMAGE_COCKROACH_v23_1_11
246+
value: cockroachdb/cockroach:v23.1.11

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

+14
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,8 @@ spec:
358358
name: RELATED_IMAGE_COCKROACH_v22_1_18
359359
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9c85c25d5392817d17b68714dca6195ad53255d43e9c65b021d75b12d97e0579
360360
name: RELATED_IMAGE_COCKROACH_v22_1_20
361+
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1a3ac544d87a9d8e7c92897c4c23f803753c7ab31467db91b5c51244afc2c6be
362+
name: RELATED_IMAGE_COCKROACH_v22_1_22
361363
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57
362364
name: RELATED_IMAGE_COCKROACH_v22_2_0
363365
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:db4e5c2f27ba23e95a363c8174c01f0f9c6b6a27e0e581c86a38f3a1f68dc43c
@@ -382,6 +384,8 @@ spec:
382384
name: RELATED_IMAGE_COCKROACH_v22_2_10
383385
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2a128b570352a5a7f82b27353f9b774caccce83e0e7bb2673e4802d96ad0bd51
384386
name: RELATED_IMAGE_COCKROACH_v22_2_12
387+
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f05824bb8eaa5a93e54059449eaa236dd83d729049ad00065ef3242f5f74c91e
388+
name: RELATED_IMAGE_COCKROACH_v22_2_14
385389
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f3ffebd812881a830ff46c860984814dd61edcd51b478ebd3667759fb7710682
386390
name: RELATED_IMAGE_COCKROACH_v23_1_0
387391
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:bc4b75ed71845d5b18e1d9163d480fd9d0d3cb5ebbcfed00a2e4e1b174c0a5de
@@ -396,6 +400,16 @@ spec:
396400
name: RELATED_IMAGE_COCKROACH_v23_1_5
397401
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9492894eaa5f43d00ac80b60029b32a0b0a85ae88ba609b46f98702c9349a5bb
398402
name: RELATED_IMAGE_COCKROACH_v23_1_6
403+
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3bf017b2b2506724500f5e29017d1b956825dd0f61a7c0049b0ff084c3554b5b
404+
name: RELATED_IMAGE_COCKROACH_v23_1_7
405+
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2d89398f03736f8ffaa82b10fed0f19fba166d3d2145b26f25cb71f3c39acf07
406+
name: RELATED_IMAGE_COCKROACH_v23_1_8
407+
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3f587e7b9f5a611013af2608e2151ed782859a52501b00adbc95739c56a8ff1e
408+
name: RELATED_IMAGE_COCKROACH_v23_1_9
409+
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d8cfb221f67516675fdfde061f6ec5dfee1224ca7eb3d8be375c27d483f306af
410+
name: RELATED_IMAGE_COCKROACH_v23_1_10
411+
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5181196fff3bf8a5ec8fcfe4f1958cc69f285f0beb4f0b476b4b5e0912f3db42
412+
name: RELATED_IMAGE_COCKROACH_v23_1_11
399413
- image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
400414
name: RELATED_IMAGE_COCKROACH_OPERATOR
401415
version: 0.0.0

config/manifests/patches/deployment_patch.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ spec:
201201
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:363d8feb560324a848c5771edd224dc19020013af7641979ee81ae8ee536d7e3
202202
- name: RELATED_IMAGE_COCKROACH_v22_1_20
203203
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9c85c25d5392817d17b68714dca6195ad53255d43e9c65b021d75b12d97e0579
204+
- name: RELATED_IMAGE_COCKROACH_v22_1_22
205+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1a3ac544d87a9d8e7c92897c4c23f803753c7ab31467db91b5c51244afc2c6be
204206
- name: RELATED_IMAGE_COCKROACH_v22_2_0
205207
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57
206208
- name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -225,6 +227,8 @@ spec:
225227
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:818f592c50d4ed5599faa053344f7ecd963003352f1faa3b72dc0f5e00a0e78b
226228
- name: RELATED_IMAGE_COCKROACH_v22_2_12
227229
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2a128b570352a5a7f82b27353f9b774caccce83e0e7bb2673e4802d96ad0bd51
230+
- name: RELATED_IMAGE_COCKROACH_v22_2_14
231+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f05824bb8eaa5a93e54059449eaa236dd83d729049ad00065ef3242f5f74c91e
228232
- name: RELATED_IMAGE_COCKROACH_v23_1_0
229233
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f3ffebd812881a830ff46c860984814dd61edcd51b478ebd3667759fb7710682
230234
- name: RELATED_IMAGE_COCKROACH_v23_1_1
@@ -239,4 +243,14 @@ spec:
239243
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acbfee4492327a720fe7da76929a86192d8af2442bbb76f0a089f6a81a890be3
240244
- name: RELATED_IMAGE_COCKROACH_v23_1_6
241245
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9492894eaa5f43d00ac80b60029b32a0b0a85ae88ba609b46f98702c9349a5bb
246+
- name: RELATED_IMAGE_COCKROACH_v23_1_7
247+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3bf017b2b2506724500f5e29017d1b956825dd0f61a7c0049b0ff084c3554b5b
248+
- name: RELATED_IMAGE_COCKROACH_v23_1_8
249+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2d89398f03736f8ffaa82b10fed0f19fba166d3d2145b26f25cb71f3c39acf07
250+
- name: RELATED_IMAGE_COCKROACH_v23_1_9
251+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3f587e7b9f5a611013af2608e2151ed782859a52501b00adbc95739c56a8ff1e
252+
- name: RELATED_IMAGE_COCKROACH_v23_1_10
253+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d8cfb221f67516675fdfde061f6ec5dfee1224ca7eb3d8be375c27d483f306af
254+
- name: RELATED_IMAGE_COCKROACH_v23_1_11
255+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5181196fff3bf8a5ec8fcfe4f1958cc69f285f0beb4f0b476b4b5e0912f3db42
242256
image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER

config/samples/crdb-tls-example.yaml

+1-1
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: v23.1.6
22+
cockroachDBVersion: v23.1.11
2323
dataStore:
2424
pvc:
2525
spec:

crdb-versions.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,9 @@ CrdbVersions:
271271
- image: cockroachdb/cockroach:v22.1.20
272272
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9c85c25d5392817d17b68714dca6195ad53255d43e9c65b021d75b12d97e0579
273273
tag: v22.1.20
274+
- image: cockroachdb/cockroach:v22.1.22
275+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1a3ac544d87a9d8e7c92897c4c23f803753c7ab31467db91b5c51244afc2c6be
276+
tag: v22.1.22
274277
- image: cockroachdb/cockroach:v22.2.0
275278
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57
276279
tag: v22.2.0
@@ -307,6 +310,9 @@ CrdbVersions:
307310
- image: cockroachdb/cockroach:v22.2.12
308311
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2a128b570352a5a7f82b27353f9b774caccce83e0e7bb2673e4802d96ad0bd51
309312
tag: v22.2.12
313+
- image: cockroachdb/cockroach:v22.2.14
314+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f05824bb8eaa5a93e54059449eaa236dd83d729049ad00065ef3242f5f74c91e
315+
tag: v22.2.14
310316
- image: cockroachdb/cockroach:v23.1.0
311317
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f3ffebd812881a830ff46c860984814dd61edcd51b478ebd3667759fb7710682
312318
tag: v23.1.0
@@ -328,3 +334,18 @@ CrdbVersions:
328334
- image: cockroachdb/cockroach:v23.1.6
329335
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9492894eaa5f43d00ac80b60029b32a0b0a85ae88ba609b46f98702c9349a5bb
330336
tag: v23.1.6
337+
- image: cockroachdb/cockroach:v23.1.7
338+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3bf017b2b2506724500f5e29017d1b956825dd0f61a7c0049b0ff084c3554b5b
339+
tag: v23.1.7
340+
- image: cockroachdb/cockroach:v23.1.8
341+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2d89398f03736f8ffaa82b10fed0f19fba166d3d2145b26f25cb71f3c39acf07
342+
tag: v23.1.8
343+
- image: cockroachdb/cockroach:v23.1.9
344+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3f587e7b9f5a611013af2608e2151ed782859a52501b00adbc95739c56a8ff1e
345+
tag: v23.1.9
346+
- image: cockroachdb/cockroach:v23.1.10
347+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d8cfb221f67516675fdfde061f6ec5dfee1224ca7eb3d8be375c27d483f306af
348+
tag: v23.1.10
349+
- image: cockroachdb/cockroach:v23.1.11
350+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5181196fff3bf8a5ec8fcfe4f1958cc69f285f0beb4f0b476b4b5e0912f3db42
351+
tag: v23.1.11

examples/client-secure-operator.yaml

+1-1
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:v23.1.6
26+
image: cockroachdb/cockroach:v23.1.11
2727
imagePullPolicy: IfNotPresent
2828
volumeMounts:
2929
- name: client-certs

examples/example.yaml

+2-2
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: v23.1.6
43+
# cockroachDBVersion: v23.1.11
4444
image:
45-
name: cockroachdb/cockroach:v23.1.6
45+
name: cockroachdb/cockroach:v23.1.11
4646
# nodes refers to the number of crdb pods that are created
4747
# via the statefulset
4848
nodes: 3

examples/smoketest.yaml

+1-1
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:v23.1.6
42+
name: cockroachdb/cockroach:v23.1.11
4343
nodes: 3

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ require (
105105
google.golang.org/appengine v1.6.7 // indirect
106106
google.golang.org/protobuf v1.26.0 // indirect
107107
gopkg.in/inf.v0 v0.9.1 // indirect
108-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
108+
gopkg.in/yaml.v3 v3.0.0 // indirect
109109
k8s.io/apiextensions-apiserver v0.21.2 // indirect
110110
k8s.io/component-base v0.21.2 // indirect
111111
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect

go.sum

+2-1
Original file line numberDiff line numberDiff line change
@@ -1908,8 +1908,9 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
19081908
gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
19091909
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
19101910
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
1911-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
19121911
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
1912+
gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
1913+
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
19131914
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
19141915
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
19151916
gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=

install/operator.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,8 @@ spec:
550550
value: cockroachdb/cockroach:v22.1.18
551551
- name: RELATED_IMAGE_COCKROACH_v22_1_20
552552
value: cockroachdb/cockroach:v22.1.20
553+
- name: RELATED_IMAGE_COCKROACH_v22_1_22
554+
value: cockroachdb/cockroach:v22.1.22
553555
- name: RELATED_IMAGE_COCKROACH_v22_2_0
554556
value: cockroachdb/cockroach:v22.2.0
555557
- name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -574,6 +576,8 @@ spec:
574576
value: cockroachdb/cockroach:v22.2.10
575577
- name: RELATED_IMAGE_COCKROACH_v22_2_12
576578
value: cockroachdb/cockroach:v22.2.12
579+
- name: RELATED_IMAGE_COCKROACH_v22_2_14
580+
value: cockroachdb/cockroach:v22.2.14
577581
- name: RELATED_IMAGE_COCKROACH_v23_1_0
578582
value: cockroachdb/cockroach:v23.1.0
579583
- name: RELATED_IMAGE_COCKROACH_v23_1_1
@@ -588,6 +592,16 @@ spec:
588592
value: cockroachdb/cockroach:v23.1.5
589593
- name: RELATED_IMAGE_COCKROACH_v23_1_6
590594
value: cockroachdb/cockroach:v23.1.6
595+
- name: RELATED_IMAGE_COCKROACH_v23_1_7
596+
value: cockroachdb/cockroach:v23.1.7
597+
- name: RELATED_IMAGE_COCKROACH_v23_1_8
598+
value: cockroachdb/cockroach:v23.1.8
599+
- name: RELATED_IMAGE_COCKROACH_v23_1_9
600+
value: cockroachdb/cockroach:v23.1.9
601+
- name: RELATED_IMAGE_COCKROACH_v23_1_10
602+
value: cockroachdb/cockroach:v23.1.10
603+
- name: RELATED_IMAGE_COCKROACH_v23_1_11
604+
value: cockroachdb/cockroach:v23.1.11
591605
- name: OPERATOR_NAME
592606
value: cockroachdb
593607
- name: POD_NAME

0 commit comments

Comments
 (0)