update to check status

ibm-mas · Dec 5, 2024 · 9be0452 · 9be0452
1 parent 1e8eda3
commit 9be0452
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...nce-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/...nce-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -156,16 +156,17 @@ spec:
                   MANAGE_DEPLOYMENTREADY_MSG=$(oc get ManageWorkspace -n ${MAS_APP_NAMESPACE} ${MAS_INSTANCE_ID}-${MAS_WORKSPACE_ID} -o=jsonpath="{.status.conditions[?(@.type=='DeploymentReady')].message}")
                   if [[ $MANAGE_DEPLOYMENTREADY_MSG == *"$ONLINE_UPDATE_DONE_MSG"* ]]; then
                     echo "Status found is: ${MANAGE_DEPLOYMENTREADY_MSG}"
-                    echo "ManageWorkspace indicates it is ready for offline upgrade, patching manageofflineupgraderequest-${MAS_WORKSPACE_ID} to requested, and removing old status"
-                    oc patch -n ${MAS_APP_NAMESPACE} manageofflineupgraderequest.apps.mas.ibm.com manageofflineupgraderequest-${MAS_WORKSPACE_ID} --subresource status --type=json -p="[{'op': 'remove', 'path': '/status'}]"
+                    echo "ManageWorkspace indicates it is ready for offline upgrade, patching manageofflineupgraderequest-${MAS_WORKSPACE_ID} to requested, and removing old status if present"
+                    UPGRADE_REQUEST_STATUS=$(oc get -n ${MAS_APP_NAMESPACE} manageofflineupgraderequest.apps.mas.ibm.com manageofflineupgraderequest-${MAS_WORKSPACE_ID} -o=jsonpath="{.status}")
+                    if [[ -n $UPGRADE_REQUEST_STATUS ]]; then 
+                      oc patch -n ${MAS_APP_NAMESPACE} manageofflineupgraderequest.apps.mas.ibm.com manageofflineupgraderequest-${MAS_WORKSPACE_ID} --subresource status --type=json -p="[{'op': 'remove', 'path': '/status'}]"
+                    fi
                     oc patch -n ${MAS_APP_NAMESPACE} manageofflineupgraderequests.apps.mas.ibm.com manageofflineupgraderequest-${MAS_WORKSPACE_ID} --type merge -p $'spec:\n stage: requested'
                     echo "Patch complete"
                   else
                     echo "Status found is: ${MANAGE_DEPLOYMENTREADY_MSG}"
                     echo "The ManageWorkspace Status does not indicate it is ready for offlineupgrade, so do nothing"
                   fi
-                  oc patch -n ${MAS_APP_NAMESPACE} manageofflineupgraderequest.apps.mas.ibm.com manageofflineupgraderequest-${MAS_WORKSPACE_ID} --subresource status --type=json -p="[{\'op\': \'remove\', \'path\': \'/status\'}]"
-                  oc patch -n ${MAS_APP_NAMESPACE} manageofflineupgraderequests.apps.mas.ibm.com manageofflineupgraderequest-${MAS_WORKSPACE_ID} --type merge -p $'spec:\n stage: requested'
           restartPolicy: Never
           serviceAccountName: {{ $sa_name }}