Browse Source

Merge "Handle "updating" and "recovering" app update states during upgrade activation"

changes/13/787213/2
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
416c209cde
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      controllerconfig/controllerconfig/upgrade-scripts/65-k8s-app-upgrade.sh

+ 6
- 2
controllerconfig/controllerconfig/upgrade-scripts/65-k8s-app-upgrade.sh View File

@ -101,8 +101,12 @@ if [ "$FROM_RELEASE" == "20.06" ] && [ "$ACTION" == "activate" ]; then
log "$NAME: $EXISTING_APP_NAME, version $EXISTING_APP_VERSION, is currently in the state: $EXISTING_APP_STATUS"
if [ "x${UPGRADE_APP_VERSION}" == "x${EXISTING_APP_VERSION}" ]; then
log "$NAME: ${UPGRADE_APP_NAME}, version ${EXISTING_APP_VERSION}, is already present. skipping..."
continue
# If the app is in uploaded or applied state, then we continue with next iteration.
# Else, the code execution proceeds and the script would exit with an unexpected state.
if [[ "${EXISTING_APP_STATUS}" =~ ^(uploaded|applied)$ ]]; then
log "$NAME: ${UPGRADE_APP_NAME}, version ${EXISTING_APP_VERSION}, is already present. skipping..."
continue
fi
fi
# All applications should be in an 'applied' or 'uploaded' state. Any other state is unexpected


Loading…
Cancel
Save