Skip to content

[4.22] OCPBUGS-91947: maxOpenShiftVersion should be bumped to 5.0 #572

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
openshift-merge-bot merged 2 commits into from
Jun 30, 2026
+8 −3
Merged

[4.22] OCPBUGS-91947: maxOpenShiftVersion should be bumped to 5.0 #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3588a0e
hack/update-metadata.sh: allow MAX_OCP_VERSION override
dobsonj Jun 23, 2026
893a5e7
Makefile: pin MAX_OCP_VERSION to 5.0
dobsonj Jun 23, 2026
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
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ BIN_PATH=$(CURPATH)/bin
YQ = $(BIN_PATH)/yq
YQ_VERSION = v4.47.1
export PATH := $(BIN_PATH):$(PATH)
export MAX_OCP_VERSION := 5.0

all: build
.PHONY: all
Expand Down
2 changes: 1 addition & 1 deletion config/aws-efs/manifests/stable/aws-efs-csi-driver-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
repository: https://github.com/openshift/aws-efs-csi-driver-operator
createdAt: "2021-07-14T00:00:00Z"
description: Install and configure AWS EFS CSI driver.
olm.properties: '[{"type":"olm.maxOpenShiftVersion","value":"4.23"}]'
olm.properties: '[{"type":"olm.maxOpenShiftVersion","value":"5.0"}]'
olm.skipRange: ">=4.9.0-0 <4.22.0"
features.operators.openshift.io/disconnected: "true"
features.operators.openshift.io/fips-compliant: "true"
Expand Down
2 changes: 1 addition & 1 deletion config/samba/manifests/stable/smb-csi-driver-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
repository: https://github.com/openshift/csi-operator
createdAt: "2021-07-14T00:00:00Z"
description: Install and configure CIFS/SMB CSI driver.
olm.properties: '[{"type":"olm.maxOpenShiftVersion","value":"4.23"}]'
olm.properties: '[{"type":"olm.maxOpenShiftVersion","value":"5.0"}]'
olm.skipRange: ">=4.15.0-0 <4.22.0"
features.operators.openshift.io/disconnected: "true"
features.operators.openshift.io/fips-compliant: "false"
Expand Down
6 changes: 5 additions & 1 deletion hack/update-metadata.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ set -o pipefail
# using the current package version, or you can for example run
# `./hack/update-metadata.sh 4.20` to set the package version to 4.20.
# Both PACKAGE_MANIFEST and CSV_MANIFEST will be updated by this script.
#
# MAX_OCP_VERSION defaults to the next minor version after OCP_VERSION, but
# can be overwritten by setting the MAX_OCP_VERSION environment variable.

PLATFORMS_NAMES=("aws-efs" "samba")
PLATFORMS_ACRONYMS=("aws-efs" "smb")
Expand Down Expand Up @@ -53,11 +56,12 @@ do
if [ "${OCP_VERSION}" != "${PACKAGE_VERSION}" ]; then
PACKAGE_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}"
fi
MAX_OCP_VERSION=${MAX_OCP_VERSION:-"${MAJOR_VERSION}.$((MINOR_VERSION + 1))"}

export NEW_CURRENT_CSV="${PACKAGE_NAME}.v${PACKAGE_VERSION}"
export NEW_METADATA_NAME="${PACKAGE_NAME}.v${PACKAGE_VERSION}"
export NEW_SKIP_RANGE=$(echo ${SKIP_RANGE} | sed "s/ <.*$/ <${PACKAGE_VERSION}/")
export NEW_OLM_PROPERTIES=$(echo "${OLM_PROPERTIES}" | jq -c 'map(if .type=="olm.maxOpenShiftVersion" then .value="'${MAJOR_VERSION}.$((MINOR_VERSION + 1))'" else . end)')
export NEW_OLM_PROPERTIES=$(echo "${OLM_PROPERTIES}" | jq -c 'map(if .type=="olm.maxOpenShiftVersion" then .value="'${MAX_OCP_VERSION}'" else . end)')
export NEW_SPEC_VERSION="${PACKAGE_VERSION}"
export NEW_ALM_STATUS_DESC="${PACKAGE_NAME}.v${PACKAGE_VERSION}"

Expand Down