Skip to content

Fix ROSA account-roles-create overriding specific patch versions #79295

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

Open
Sandeepyadav93 wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −3
Open

Fix ROSA account-roles-create overriding specific patch versions #79295

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
8 changes: 5 additions & 3 deletions ...tor/step-registry/rosa/sts/account-roles/create/rosa-sts-account-roles-create-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ OPENSHIFT_VERSION=${OPENSHIFT_VERSION:-}
CHANNEL_GROUP=${CHANNEL_GROUP}
PERMISSIONS_BOUNDARY=${PERMISSIONS_BOUNDARY:-}
ACCOUNT_ROLES_PREFIX=$(head -n 1 "${SHARED_DIR}/cluster-prefix")
FALLBACK_OCCURRED=false

# Configure aws
AWSCRED="${CLUSTER_PROFILE_DIR}/.awscred"
Expand Down Expand Up @@ -121,6 +122,7 @@ elif [[ "${create_ret}" -ne 0 ]]; then
echo "Retrying with version ${fallback_version} (was ${OPENSHIFT_VERSION})"
OPENSHIFT_VERSION="${fallback_version}"
VERSION_SWITCH="--version ${OPENSHIFT_VERSION} --channel-group ${CHANNEL_GROUP}"
FALLBACK_OCCURRED=true
rosa create account-roles -y --mode auto \
--prefix ${ACCOUNT_ROLES_PREFIX} \
${CLUSTER_SWITCH} \
Expand All @@ -134,10 +136,10 @@ elif [[ "${create_ret}" -ne 0 ]]; then
fi
fi

# Share the resolved version (includes fallback if one was used)
if [[ "${CHANNEL_GROUP}" != "stable" && -n "${OPENSHIFT_VERSION:-}" ]]; then
# Share the resolved version only if a fallback occurred
if [[ "${FALLBACK_OCCURRED}" == "true" && "${CHANNEL_GROUP}" != "stable" && -n "${OPENSHIFT_VERSION:-}" ]]; then
echo -n "${OPENSHIFT_VERSION}" > "${SHARED_DIR}/openshift_version"
echo "Stored resolved version ${OPENSHIFT_VERSION} to SHARED_DIR"
echo "Stored fallback version ${OPENSHIFT_VERSION} to SHARED_DIR"
fi

# Store the account-role-prefix for the next pre steps and the account roles deletion
Expand Down