Skip to content

Commit cea4d9a

Browse files
authored
Update the openshift versions to be supported 4.19 (#1095)
1 parent bbab5c4 commit cea4d9a

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

config/manifests/patches/deployment_patch.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,4 +351,6 @@ spec:
351351
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd6c9b8ca82ff4f2d0fe29166d1fc9bca6439cb40907be60f4d8f1b9735de2f7
352352
- name: RELATED_IMAGE_COCKROACH_v25_1_2
353353
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b83eaff2e217c06098509709cead525b55b00ccd48019d8357e6231892008055
354+
- name: RELATED_IMAGE_COCKROACH_OPERATOR
355+
value: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
354356
image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER

config/templates/deployment_patch.yaml.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,6 @@ spec:
4949
- name: RELATED_IMAGE_COCKROACH_{{ underscore .Tag }}
5050
value: {{ .RedhatImage }}
5151
{{- end }}
52+
- name: RELATED_IMAGE_COCKROACH_OPERATOR
53+
value: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
5254
image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER

hack/bundle.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ if [[ -z "${BUILD_WORKSPACE_DIRECTORY:-}" ]]; then
2121
exit 1
2222
fi
2323

24+
openshift_versions="v4.12-v4.19"
25+
2426
# ensure tool dependencies are on the path
2527
export PATH="$(pwd)/hack/bin:${PATH}"
2628

@@ -76,7 +78,7 @@ generate_bundle() {
7678

7779
# Ensure package name is correct for the specific bundle and that the CSV name matches the package name. Also removing
7880
# the testing annotations since these are handled automatically upstream. Also add openshift version annotation
79-
local openshift_version_annotation=" com.redhat.openshift.versions: v4.8"
81+
local openshift_version_annotation=" com.redhat.openshift.versions: ${openshift_versions}"
8082
sed \
8183
-e "s+annotations:+annotations:\n # Minimum Openshift version annotation\n${openshift_version_annotation}+" \
8284
-e "s/package.v1: cockroach-operator/package.v1: ${pkg}/g" \

0 commit comments

Comments
 (0)