Skip to content
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.

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

Review changes from scripts-dev to scripts-adopter #2240

Merged
merged 1 commit into from
Oct 4, 2024
Merged
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions cp3pt0-deployment/setup_tenant.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ YQ=yq
ENABLE_LICENSING=0
MINIMAL_RBAC_ENABLED=0
MINIMAL_RBAC=""
CHANNEL="v4.6"
CHANNEL="v4.10"
MAINTAINED_CHANNEL="v4.2"
SOURCE="opencloud-operators"
SOURCE_NS="openshift-marketplace"
Expand Down Expand Up @@ -266,9 +266,10 @@ function pre_req() {

# When Common Service channel info is less then maintained channel, update maintained channel for backward compatibility e.g., v4.1 and v4.0
# Otherwise, maintained channel is pinned at v4.2
local channel_numeric="${CHANNEL#v}"
local maintained_channel_numeric="${MAINTAINED_CHANNEL#v}"
if awk -v num="$channel_numeric" "BEGIN { exit !(num < $maintained_channel_numeric) }"; then
IFS='.' read -r channel_major channel_minor <<< "${CHANNEL#v}"
IFS='.' read -r maintained_major maintained_minor <<< "${MAINTAINED_CHANNEL#v}"

if (( channel_major < maintained_major )) || { (( channel_major == maintained_major )) && (( channel_minor < maintained_minor )); }; then
MAINTAINED_CHANNEL="$CHANNEL"
fi

Expand Down
Loading