From dd940d0771f7fd4adbe0d675052d56a2b8f9e57d Mon Sep 17 00:00:00 2001 From: Prafull Ladha Date: Tue, 10 Oct 2023 23:20:44 +0530 Subject: [PATCH] Update CRDB versions (#1007) * Update CRDB versions * Bump gopkg.in/yaml.v3 from 3.0.0-20210107192922-496545a6307b to 3.0.0 --- config/manager/patches/image.yaml | 14 +++++++++++++ ...kroach-operator.clusterserviceversion.yaml | 14 +++++++++++++ .../manifests/patches/deployment_patch.yaml | 14 +++++++++++++ config/samples/crdb-tls-example.yaml | 2 +- crdb-versions.yaml | 21 +++++++++++++++++++ examples/client-secure-operator.yaml | 2 +- examples/example.yaml | 4 ++-- examples/smoketest.yaml | 2 +- go.mod | 2 +- go.sum | 3 ++- install/operator.yaml | 14 +++++++++++++ 11 files changed, 85 insertions(+), 7 deletions(-) diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml index 6d22d8282..59ba8598b 100644 --- a/config/manager/patches/image.yaml +++ b/config/manager/patches/image.yaml @@ -192,6 +192,8 @@ spec: value: cockroachdb/cockroach:v22.1.18 - name: RELATED_IMAGE_COCKROACH_v22_1_20 value: cockroachdb/cockroach:v22.1.20 + - name: RELATED_IMAGE_COCKROACH_v22_1_22 + value: cockroachdb/cockroach:v22.1.22 - name: RELATED_IMAGE_COCKROACH_v22_2_0 value: cockroachdb/cockroach:v22.2.0 - name: RELATED_IMAGE_COCKROACH_v22_2_1 @@ -216,6 +218,8 @@ spec: value: cockroachdb/cockroach:v22.2.10 - name: RELATED_IMAGE_COCKROACH_v22_2_12 value: cockroachdb/cockroach:v22.2.12 + - name: RELATED_IMAGE_COCKROACH_v22_2_14 + value: cockroachdb/cockroach:v22.2.14 - name: RELATED_IMAGE_COCKROACH_v23_1_0 value: cockroachdb/cockroach:v23.1.0 - name: RELATED_IMAGE_COCKROACH_v23_1_1 @@ -230,3 +234,13 @@ spec: value: cockroachdb/cockroach:v23.1.5 - name: RELATED_IMAGE_COCKROACH_v23_1_6 value: cockroachdb/cockroach:v23.1.6 + - name: RELATED_IMAGE_COCKROACH_v23_1_7 + value: cockroachdb/cockroach:v23.1.7 + - name: RELATED_IMAGE_COCKROACH_v23_1_8 + value: cockroachdb/cockroach:v23.1.8 + - name: RELATED_IMAGE_COCKROACH_v23_1_9 + value: cockroachdb/cockroach:v23.1.9 + - name: RELATED_IMAGE_COCKROACH_v23_1_10 + value: cockroachdb/cockroach:v23.1.10 + - name: RELATED_IMAGE_COCKROACH_v23_1_11 + value: cockroachdb/cockroach:v23.1.11 diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml index 332481191..02f834835 100644 --- a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml @@ -358,6 +358,8 @@ spec: name: RELATED_IMAGE_COCKROACH_v22_1_18 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9c85c25d5392817d17b68714dca6195ad53255d43e9c65b021d75b12d97e0579 name: RELATED_IMAGE_COCKROACH_v22_1_20 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1a3ac544d87a9d8e7c92897c4c23f803753c7ab31467db91b5c51244afc2c6be + name: RELATED_IMAGE_COCKROACH_v22_1_22 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57 name: RELATED_IMAGE_COCKROACH_v22_2_0 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:db4e5c2f27ba23e95a363c8174c01f0f9c6b6a27e0e581c86a38f3a1f68dc43c @@ -382,6 +384,8 @@ spec: name: RELATED_IMAGE_COCKROACH_v22_2_10 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2a128b570352a5a7f82b27353f9b774caccce83e0e7bb2673e4802d96ad0bd51 name: RELATED_IMAGE_COCKROACH_v22_2_12 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f05824bb8eaa5a93e54059449eaa236dd83d729049ad00065ef3242f5f74c91e + name: RELATED_IMAGE_COCKROACH_v22_2_14 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f3ffebd812881a830ff46c860984814dd61edcd51b478ebd3667759fb7710682 name: RELATED_IMAGE_COCKROACH_v23_1_0 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:bc4b75ed71845d5b18e1d9163d480fd9d0d3cb5ebbcfed00a2e4e1b174c0a5de @@ -396,6 +400,16 @@ spec: name: RELATED_IMAGE_COCKROACH_v23_1_5 - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9492894eaa5f43d00ac80b60029b32a0b0a85ae88ba609b46f98702c9349a5bb name: RELATED_IMAGE_COCKROACH_v23_1_6 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3bf017b2b2506724500f5e29017d1b956825dd0f61a7c0049b0ff084c3554b5b + name: RELATED_IMAGE_COCKROACH_v23_1_7 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2d89398f03736f8ffaa82b10fed0f19fba166d3d2145b26f25cb71f3c39acf07 + name: RELATED_IMAGE_COCKROACH_v23_1_8 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3f587e7b9f5a611013af2608e2151ed782859a52501b00adbc95739c56a8ff1e + name: RELATED_IMAGE_COCKROACH_v23_1_9 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d8cfb221f67516675fdfde061f6ec5dfee1224ca7eb3d8be375c27d483f306af + name: RELATED_IMAGE_COCKROACH_v23_1_10 + - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5181196fff3bf8a5ec8fcfe4f1958cc69f285f0beb4f0b476b4b5e0912f3db42 + name: RELATED_IMAGE_COCKROACH_v23_1_11 - 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 119147594..6395f4eb3 100644 --- a/config/manifests/patches/deployment_patch.yaml +++ b/config/manifests/patches/deployment_patch.yaml @@ -201,6 +201,8 @@ spec: value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:363d8feb560324a848c5771edd224dc19020013af7641979ee81ae8ee536d7e3 - name: RELATED_IMAGE_COCKROACH_v22_1_20 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9c85c25d5392817d17b68714dca6195ad53255d43e9c65b021d75b12d97e0579 + - name: RELATED_IMAGE_COCKROACH_v22_1_22 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1a3ac544d87a9d8e7c92897c4c23f803753c7ab31467db91b5c51244afc2c6be - name: RELATED_IMAGE_COCKROACH_v22_2_0 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57 - name: RELATED_IMAGE_COCKROACH_v22_2_1 @@ -225,6 +227,8 @@ spec: value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:818f592c50d4ed5599faa053344f7ecd963003352f1faa3b72dc0f5e00a0e78b - name: RELATED_IMAGE_COCKROACH_v22_2_12 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2a128b570352a5a7f82b27353f9b774caccce83e0e7bb2673e4802d96ad0bd51 + - name: RELATED_IMAGE_COCKROACH_v22_2_14 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f05824bb8eaa5a93e54059449eaa236dd83d729049ad00065ef3242f5f74c91e - name: RELATED_IMAGE_COCKROACH_v23_1_0 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f3ffebd812881a830ff46c860984814dd61edcd51b478ebd3667759fb7710682 - name: RELATED_IMAGE_COCKROACH_v23_1_1 @@ -239,4 +243,14 @@ spec: value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acbfee4492327a720fe7da76929a86192d8af2442bbb76f0a089f6a81a890be3 - name: RELATED_IMAGE_COCKROACH_v23_1_6 value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9492894eaa5f43d00ac80b60029b32a0b0a85ae88ba609b46f98702c9349a5bb + - name: RELATED_IMAGE_COCKROACH_v23_1_7 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3bf017b2b2506724500f5e29017d1b956825dd0f61a7c0049b0ff084c3554b5b + - name: RELATED_IMAGE_COCKROACH_v23_1_8 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2d89398f03736f8ffaa82b10fed0f19fba166d3d2145b26f25cb71f3c39acf07 + - name: RELATED_IMAGE_COCKROACH_v23_1_9 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3f587e7b9f5a611013af2608e2151ed782859a52501b00adbc95739c56a8ff1e + - name: RELATED_IMAGE_COCKROACH_v23_1_10 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d8cfb221f67516675fdfde061f6ec5dfee1224ca7eb3d8be375c27d483f306af + - name: RELATED_IMAGE_COCKROACH_v23_1_11 + value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5181196fff3bf8a5ec8fcfe4f1958cc69f285f0beb4f0b476b4b5e0912f3db42 image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER diff --git a/config/samples/crdb-tls-example.yaml b/config/samples/crdb-tls-example.yaml index 0c6de7ecf..50b328412 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.1.6 + cockroachDBVersion: v23.1.11 dataStore: pvc: spec: diff --git a/crdb-versions.yaml b/crdb-versions.yaml index d81a8a779..77b6e4894 100644 --- a/crdb-versions.yaml +++ b/crdb-versions.yaml @@ -271,6 +271,9 @@ CrdbVersions: - image: cockroachdb/cockroach:v22.1.20 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9c85c25d5392817d17b68714dca6195ad53255d43e9c65b021d75b12d97e0579 tag: v22.1.20 +- image: cockroachdb/cockroach:v22.1.22 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1a3ac544d87a9d8e7c92897c4c23f803753c7ab31467db91b5c51244afc2c6be + tag: v22.1.22 - image: cockroachdb/cockroach:v22.2.0 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57 tag: v22.2.0 @@ -307,6 +310,9 @@ CrdbVersions: - image: cockroachdb/cockroach:v22.2.12 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2a128b570352a5a7f82b27353f9b774caccce83e0e7bb2673e4802d96ad0bd51 tag: v22.2.12 +- image: cockroachdb/cockroach:v22.2.14 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f05824bb8eaa5a93e54059449eaa236dd83d729049ad00065ef3242f5f74c91e + tag: v22.2.14 - image: cockroachdb/cockroach:v23.1.0 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f3ffebd812881a830ff46c860984814dd61edcd51b478ebd3667759fb7710682 tag: v23.1.0 @@ -328,3 +334,18 @@ CrdbVersions: - image: cockroachdb/cockroach:v23.1.6 redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9492894eaa5f43d00ac80b60029b32a0b0a85ae88ba609b46f98702c9349a5bb tag: v23.1.6 +- image: cockroachdb/cockroach:v23.1.7 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3bf017b2b2506724500f5e29017d1b956825dd0f61a7c0049b0ff084c3554b5b + tag: v23.1.7 +- image: cockroachdb/cockroach:v23.1.8 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2d89398f03736f8ffaa82b10fed0f19fba166d3d2145b26f25cb71f3c39acf07 + tag: v23.1.8 +- image: cockroachdb/cockroach:v23.1.9 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:3f587e7b9f5a611013af2608e2151ed782859a52501b00adbc95739c56a8ff1e + tag: v23.1.9 +- image: cockroachdb/cockroach:v23.1.10 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d8cfb221f67516675fdfde061f6ec5dfee1224ca7eb3d8be375c27d483f306af + tag: v23.1.10 +- image: cockroachdb/cockroach:v23.1.11 + redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5181196fff3bf8a5ec8fcfe4f1958cc69f285f0beb4f0b476b4b5e0912f3db42 + tag: v23.1.11 diff --git a/examples/client-secure-operator.yaml b/examples/client-secure-operator.yaml index 24da38d49..edb1e22d8 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.1.6 + image: cockroachdb/cockroach:v23.1.11 imagePullPolicy: IfNotPresent volumeMounts: - name: client-certs diff --git a/examples/example.yaml b/examples/example.yaml index 3d567524d..7b9dd131b 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.1.6 +# cockroachDBVersion: v23.1.11 image: - name: cockroachdb/cockroach:v23.1.6 + name: cockroachdb/cockroach:v23.1.11 # 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 b8e2f70e2..108e450b5 100644 --- a/examples/smoketest.yaml +++ b/examples/smoketest.yaml @@ -39,5 +39,5 @@ spec: memory: 300Mi tlsEnabled: true image: - name: cockroachdb/cockroach:v23.1.6 + name: cockroachdb/cockroach:v23.1.11 nodes: 3 diff --git a/go.mod b/go.mod index 48ae35093..7112bd4e8 100644 --- a/go.mod +++ b/go.mod @@ -105,7 +105,7 @@ require ( google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.26.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.0 // indirect k8s.io/apiextensions-apiserver v0.21.2 // indirect k8s.io/component-base v0.21.2 // indirect k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect diff --git a/go.sum b/go.sum index 4df5e9d1f..b49b4b4a9 100644 --- a/go.sum +++ b/go.sum @@ -1908,8 +1908,9 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= diff --git a/install/operator.yaml b/install/operator.yaml index 8df34ef8a..80486706a 100644 --- a/install/operator.yaml +++ b/install/operator.yaml @@ -550,6 +550,8 @@ spec: value: cockroachdb/cockroach:v22.1.18 - name: RELATED_IMAGE_COCKROACH_v22_1_20 value: cockroachdb/cockroach:v22.1.20 + - name: RELATED_IMAGE_COCKROACH_v22_1_22 + value: cockroachdb/cockroach:v22.1.22 - name: RELATED_IMAGE_COCKROACH_v22_2_0 value: cockroachdb/cockroach:v22.2.0 - name: RELATED_IMAGE_COCKROACH_v22_2_1 @@ -574,6 +576,8 @@ spec: value: cockroachdb/cockroach:v22.2.10 - name: RELATED_IMAGE_COCKROACH_v22_2_12 value: cockroachdb/cockroach:v22.2.12 + - name: RELATED_IMAGE_COCKROACH_v22_2_14 + value: cockroachdb/cockroach:v22.2.14 - name: RELATED_IMAGE_COCKROACH_v23_1_0 value: cockroachdb/cockroach:v23.1.0 - name: RELATED_IMAGE_COCKROACH_v23_1_1 @@ -588,6 +592,16 @@ spec: value: cockroachdb/cockroach:v23.1.5 - name: RELATED_IMAGE_COCKROACH_v23_1_6 value: cockroachdb/cockroach:v23.1.6 + - name: RELATED_IMAGE_COCKROACH_v23_1_7 + value: cockroachdb/cockroach:v23.1.7 + - name: RELATED_IMAGE_COCKROACH_v23_1_8 + value: cockroachdb/cockroach:v23.1.8 + - name: RELATED_IMAGE_COCKROACH_v23_1_9 + value: cockroachdb/cockroach:v23.1.9 + - name: RELATED_IMAGE_COCKROACH_v23_1_10 + value: cockroachdb/cockroach:v23.1.10 + - name: RELATED_IMAGE_COCKROACH_v23_1_11 + value: cockroachdb/cockroach:v23.1.11 - name: OPERATOR_NAME value: cockroachdb - name: POD_NAME