Skip to content

Commit 807ae69

Browse files
prafull01prafull01
authored
Fix the jobs to release on openshift certification (#998)
* Fix the jobs to release on openshift certification * Update CRDB versions * Add additional env variables to CSV for certification
1 parent da60e7b commit 807ae69

File tree

11 files changed

+257
-211
lines changed

11 files changed

+257
-211
lines changed

‎build/release/teamcity-publish-openshift.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ set -euxo pipefail
1818
source "$(dirname "${0}")/teamcity-support.sh"
1919

2020
RH_PROJECT_ID="5e6027425c5456060d5f6084"
21-
RH_REGISTRY="scan.connect.redhat.com"
22-
RH_OPERATOR_IMG="${RH_REGISTRY}/ospid-cf721588-ad8a-4618-938c-5191c5e10ae4/cockroachdb-operator:${TAG}"
21+
RH_REGISTRY="quay.io"
22+
RH_OPERATOR_IMG="${RH_REGISTRY}/redhat-isv-containers/${RH_PROJECT_ID}:${TAG}"
2323

2424
OPERATOR_IMG="docker.io/cockroachdb/cockroach-operator:${TAG}"
2525
if ! [[ -z "${DRY_RUN}" ]] ; then

‎config/manager/patches/image.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,8 @@ spec:
214214
value: cockroachdb/cockroach:v22.2.9
215215
- name: RELATED_IMAGE_COCKROACH_v22_2_10
216216
value: cockroachdb/cockroach:v22.2.10
217+
- name: RELATED_IMAGE_COCKROACH_v22_2_12
218+
value: cockroachdb/cockroach:v22.2.12
217219
- name: RELATED_IMAGE_COCKROACH_v23_1_0
218220
value: cockroachdb/cockroach:v23.1.0
219221
- name: RELATED_IMAGE_COCKROACH_v23_1_1
@@ -226,3 +228,5 @@ spec:
226228
value: cockroachdb/cockroach:v23.1.4
227229
- name: RELATED_IMAGE_COCKROACH_v23_1_5
228230
value: cockroachdb/cockroach:v23.1.5
231+
- name: RELATED_IMAGE_COCKROACH_v23_1_6
232+
value: cockroachdb/cockroach:v23.1.6

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

Lines changed: 217 additions & 201 deletions
Large diffs are not rendered by default.

‎config/manifests/patches/deployment_patch.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ spec:
223223
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9ab968e4ca62f23bf9848e5475ef4076df7318a8560f63d5b2090a32af6fe4e2
224224
- name: RELATED_IMAGE_COCKROACH_v22_2_10
225225
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:818f592c50d4ed5599faa053344f7ecd963003352f1faa3b72dc0f5e00a0e78b
226+
- name: RELATED_IMAGE_COCKROACH_v22_2_12
227+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2a128b570352a5a7f82b27353f9b774caccce83e0e7bb2673e4802d96ad0bd51
226228
- name: RELATED_IMAGE_COCKROACH_v23_1_0
227229
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f3ffebd812881a830ff46c860984814dd61edcd51b478ebd3667759fb7710682
228230
- name: RELATED_IMAGE_COCKROACH_v23_1_1
@@ -235,4 +237,6 @@ spec:
235237
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:42c9930d6861f6a2147ed6e01827eddd730279966763ec68868567a19cc164ab
236238
- name: RELATED_IMAGE_COCKROACH_v23_1_5
237239
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acbfee4492327a720fe7da76929a86192d8af2442bbb76f0a089f6a81a890be3
240+
- name: RELATED_IMAGE_COCKROACH_v23_1_6
241+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9492894eaa5f43d00ac80b60029b32a0b0a85ae88ba609b46f98702c9349a5bb
238242
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: v23.1.5
22+
cockroachDBVersion: v23.1.6
2323
dataStore:
2424
pvc:
2525
spec:

‎config/templates/csv.yaml.in‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,16 @@ spec:
9696
expose the services using Ingress
9797
displayName: Cockroach Database Ingress
9898
path: ingress
99+
- description: '(Optional) LogConfigMap define the config map which contains
100+
log configuration used to send the logs through the proper channels in the
101+
cockroachdb. Logging configuration is available for cockroach version v21.1.0
102+
onwards. The logging configuration is taken in format of yaml file, you
103+
can check the logging configuration here (https://www.cockroachlabs.com/docs/stable/configure-logs.html#default-logging-configuration)
104+
The default logging for cockroach version v20.x or less is stderr, logging
105+
API is ignored for older versions. NOTE: The `data` field of map must contain
106+
an entry called `logging.yaml` that contains config options.'
107+
displayName: Cockroach Database Logging configuration config map
108+
path: logConfigMap
99109
- description: (Optional) If specified, the pod's nodeSelector
100110
displayName: Map of nodeSelectors to match when scheduling pods on nodes
101111
path: nodeSelector
@@ -181,9 +191,11 @@ spec:
181191
minKubeVersion: 1.18.0
182192
provider:
183193
name: Cockroach Labs
184-
version: 0.0.0
185194
relatedImages:
186195
{{- range .CrdbVersions}}
187-
- name: RELATED_IMAGE_COCKROACH_{{ underscore .Tag }}
188-
image: {{ .RedhatImage }}
196+
- image: {{ .RedhatImage }}
197+
name: RELATED_IMAGE_COCKROACH_{{ underscore .Tag }}
189198
{{- end }}
199+
- image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
200+
name: RELATED_IMAGE_COCKROACH_OPERATOR
201+
version: 0.0.0

‎crdb-versions.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,9 @@ CrdbVersions:
304304
- image: cockroachdb/cockroach:v22.2.10
305305
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:818f592c50d4ed5599faa053344f7ecd963003352f1faa3b72dc0f5e00a0e78b
306306
tag: v22.2.10
307+
- image: cockroachdb/cockroach:v22.2.12
308+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2a128b570352a5a7f82b27353f9b774caccce83e0e7bb2673e4802d96ad0bd51
309+
tag: v22.2.12
307310
- image: cockroachdb/cockroach:v23.1.0
308311
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f3ffebd812881a830ff46c860984814dd61edcd51b478ebd3667759fb7710682
309312
tag: v23.1.0
@@ -322,3 +325,6 @@ CrdbVersions:
322325
- image: cockroachdb/cockroach:v23.1.5
323326
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acbfee4492327a720fe7da76929a86192d8af2442bbb76f0a089f6a81a890be3
324327
tag: v23.1.5
328+
- image: cockroachdb/cockroach:v23.1.6
329+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9492894eaa5f43d00ac80b60029b32a0b0a85ae88ba609b46f98702c9349a5bb
330+
tag: v23.1.6

‎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:v23.1.5
26+
image: cockroachdb/cockroach:v23.1.6
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: v23.1.5
43+
# cockroachDBVersion: v23.1.6
4444
image:
45-
name: cockroachdb/cockroach:v23.1.5
45+
name: cockroachdb/cockroach:v23.1.6
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:v23.1.5
42+
name: cockroachdb/cockroach:v23.1.6
4343
nodes: 3

0 commit comments

Comments
 (0)