Skip to content

Commit 7d11ffe

Browse files
prafull01prafull01
committed
Build, Publish and automate release process for openshift
1 parent 4451823 commit 7d11ffe

File tree

15 files changed

+48
-14
lines changed

15 files changed

+48
-14
lines changed

‎Makefile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,3 +363,16 @@ PKG_MAN_OPTS ?= "$(PKG_CHANNELS) $(PKG_DEFAULT_CHANNEL)"
363363
.PHONY: release/generate-bundle
364364
release/generate-bundle:
365365
bazel run //hack:bundle -- $(RH_BUNDLE_VERSION) $(RH_OPERATOR_IMAGE) $(PKG_MAN_OPTS) $(RH_COCKROACH_DATABASE_IMAGE)
366+
367+
.PHONY: release/publish-operator
368+
publish-operator:
369+
./build/release/teamcity-publish-release.sh
370+
371+
.PHONY: release/publish-operator-openshift
372+
publish-operator-openshift:
373+
./build/release/teamcity-publish-openshift.sh
374+
375+
.PHONY: release/publish-openshift-bundle
376+
release/publish-openshift-bundle:
377+
./build/release/teamcity-publish-openshift-bundle.sh
378+

‎config/default/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ k8s_deploy(
3434
# when running locally, use the image from the local codebase
3535
"cockroachdb/cockroach-operator:$(APP_VERSION)": "//cmd/cockroach-operator:operator_image",
3636
},
37-
resolver_args = ["--allow_unused_images"],
37+
resolver_args = ["--allow_unused_images"],
3838
template = ":manifest",
3939
)
4040

‎config/manager/patches/image.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ spec:
186186
value: cockroachdb/cockroach:v22.1.14
187187
- name: RELATED_IMAGE_COCKROACH_v22_1_15
188188
value: cockroachdb/cockroach:v22.1.15
189+
- name: RELATED_IMAGE_COCKROACH_v22_1_16
190+
value: cockroachdb/cockroach:v22.1.16
189191
- name: RELATED_IMAGE_COCKROACH_v22_2_0
190192
value: cockroachdb/cockroach:v22.2.0
191193
- name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -198,3 +200,5 @@ spec:
198200
value: cockroachdb/cockroach:v22.2.4
199201
- name: RELATED_IMAGE_COCKROACH_v22_2_5
200202
value: cockroachdb/cockroach:v22.2.5
203+
- name: RELATED_IMAGE_COCKROACH_v22_2_6
204+
value: cockroachdb/cockroach:v22.2.6

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,8 @@ spec:
343343
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7b907d03b001b758d8a4b5e898725c73dda2ec2aa4b7425b685320b947154d11
344344
- name: RELATED_IMAGE_COCKROACH_v22_1_15
345345
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0ec1dc184a2199736b4bd7de3241a357be7427caea5da1c931b08bc06f5c3dc0
346+
- name: RELATED_IMAGE_COCKROACH_v22_1_16
347+
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1d590946b2f7c7ec0c7ec057a338e81f864d6a9e3d3ac4e0769aa5756a8e13fc
346348
- name: RELATED_IMAGE_COCKROACH_v22_2_0
347349
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57
348350
- name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -355,3 +357,5 @@ spec:
355357
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:086d7b435993fdf21fd59b0093f52105a9028d6b769398b0033f98a65dfb7e79
356358
- name: RELATED_IMAGE_COCKROACH_v22_2_5
357359
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0fea6ed8a78ea624240ee6ffb3573d5cf1115186aa9180fcd7d1273351deaaa3
360+
- name: RELATED_IMAGE_COCKROACH_v22_2_6
361+
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:53c7b960a2ed70a0998a4f8e28a4f78f7f676e01cffebe665e91e3a7629d88ed

‎config/manifests/kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ namespace: placeholder
1717
resources:
1818
- ../default
1919
- ../samples
20+
- ../scorecard
21+
2022

2123
patchesStrategicMerge:
2224
- patches/deployment_patch.yaml

‎config/manifests/patches/deployment_patch.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@ spec:
195195
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7b907d03b001b758d8a4b5e898725c73dda2ec2aa4b7425b685320b947154d11
196196
- name: RELATED_IMAGE_COCKROACH_v22_1_15
197197
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0ec1dc184a2199736b4bd7de3241a357be7427caea5da1c931b08bc06f5c3dc0
198+
- name: RELATED_IMAGE_COCKROACH_v22_1_16
199+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1d590946b2f7c7ec0c7ec057a338e81f864d6a9e3d3ac4e0769aa5756a8e13fc
198200
- name: RELATED_IMAGE_COCKROACH_v22_2_0
199201
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57
200202
- name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -207,4 +209,6 @@ spec:
207209
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:086d7b435993fdf21fd59b0093f52105a9028d6b769398b0033f98a65dfb7e79
208210
- name: RELATED_IMAGE_COCKROACH_v22_2_5
209211
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0fea6ed8a78ea624240ee6ffb3573d5cf1115186aa9180fcd7d1273351deaaa3
212+
- name: RELATED_IMAGE_COCKROACH_v22_2_6
213+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:53c7b960a2ed70a0998a4f8e28a4f78f7f676e01cffebe665e91e3a7629d88ed
210214
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: v22.2.5
22+
cockroachDBVersion: v22.2.6
2323
dataStore:
2424
pvc:
2525
spec:

‎crdb-versions.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,9 @@ CrdbVersions:
262262
- image: cockroachdb/cockroach:v22.1.15
263263
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0ec1dc184a2199736b4bd7de3241a357be7427caea5da1c931b08bc06f5c3dc0
264264
tag: v22.1.15
265+
- image: cockroachdb/cockroach:v22.1.16
266+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1d590946b2f7c7ec0c7ec057a338e81f864d6a9e3d3ac4e0769aa5756a8e13fc
267+
tag: v22.1.16
265268
- image: cockroachdb/cockroach:v22.2.0
266269
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57
267270
tag: v22.2.0
@@ -280,3 +283,6 @@ CrdbVersions:
280283
- image: cockroachdb/cockroach:v22.2.5
281284
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0fea6ed8a78ea624240ee6ffb3573d5cf1115186aa9180fcd7d1273351deaaa3
282285
tag: v22.2.5
286+
- image: cockroachdb/cockroach:v22.2.6
287+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:53c7b960a2ed70a0998a4f8e28a4f78f7f676e01cffebe665e91e3a7629d88ed
288+
tag: v22.2.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:v22.2.5
26+
image: cockroachdb/cockroach:v22.2.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: v22.2.5
43+
# cockroachDBVersion: v22.2.6
4444
image:
45-
name: cockroachdb/cockroach:v22.2.5
45+
name: cockroachdb/cockroach:v22.2.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:v22.2.5
42+
name: cockroachdb/cockroach:v22.2.6
4343
nodes: 3

‎hack/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ sh_binary(
133133
name = "redhat-preflight",
134134
srcs = ["redhat.sh"],
135135
data = [
136-
JQ,
137-
OPM,
138-
"//hack/bin:preflight",
139-
"@//:all-srcs",
136+
JQ,
137+
OPM,
138+
"//hack/bin:preflight",
139+
"@//:all-srcs",
140140
],
141141
)
142142

‎hack/bundle.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ generate_bundle() {
8484

8585
mv "${dir}/metadata/annotations.yaml.new" "${dir}/metadata/annotations.yaml"
8686

87-
# add supported openshift versions
88-
echo " com.redhat.openshift.versions: 4.7-4.10" >> "${dir}/metadata/annotations.yaml"
89-
9087
# Update CSV with correct images, and timestamps
9188
adapt_csv "${dir}" "${img}"
9289

‎hack/redhat.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright 2022 The Cockroach Authors
3+
# Copyright 2023 The Cockroach Authors
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎install/operator.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,8 @@ spec:
544544
value: cockroachdb/cockroach:v22.1.14
545545
- name: RELATED_IMAGE_COCKROACH_v22_1_15
546546
value: cockroachdb/cockroach:v22.1.15
547+
- name: RELATED_IMAGE_COCKROACH_v22_1_16
548+
value: cockroachdb/cockroach:v22.1.16
547549
- name: RELATED_IMAGE_COCKROACH_v22_2_0
548550
value: cockroachdb/cockroach:v22.2.0
549551
- name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -556,6 +558,8 @@ spec:
556558
value: cockroachdb/cockroach:v22.2.4
557559
- name: RELATED_IMAGE_COCKROACH_v22_2_5
558560
value: cockroachdb/cockroach:v22.2.5
561+
- name: RELATED_IMAGE_COCKROACH_v22_2_6
562+
value: cockroachdb/cockroach:v22.2.6
559563
- name: OPERATOR_NAME
560564
value: cockroachdb
561565
- name: POD_NAME

0 commit comments

Comments
 (0)