Skip to content

Update the openshift versions to be supported 4.19 #1095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prafull01 merged 1 commit into from
Apr 3, 2025
Merged

Update the openshift versions to be supported 4.19 #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/manifests/patches/deployment_patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,4 +351,6 @@ spec:
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd6c9b8ca82ff4f2d0fe29166d1fc9bca6439cb40907be60f4d8f1b9735de2f7
- name: RELATED_IMAGE_COCKROACH_v25_1_2
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:b83eaff2e217c06098509709cead525b55b00ccd48019d8357e6231892008055
- name: RELATED_IMAGE_COCKROACH_OPERATOR
value: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
2 changes: 2 additions & 0 deletions config/templates/deployment_patch.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,6 @@ spec:
- name: RELATED_IMAGE_COCKROACH_{{ underscore .Tag }}
value: {{ .RedhatImage }}
{{- end }}
- name: RELATED_IMAGE_COCKROACH_OPERATOR
value: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
4 changes: 3 additions & 1 deletion hack/bundle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ if [[ -z "${BUILD_WORKSPACE_DIRECTORY:-}" ]]; then
exit 1
fi

openshift_versions="v4.12-v4.19"

# ensure tool dependencies are on the path
export PATH="$(pwd)/hack/bin:${PATH}"

Expand Down Expand Up @@ -76,7 +78,7 @@ generate_bundle() {

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