Refactor app rollback checks and stop conditions

functions/update/post_process.sh

@@ -45,11 +45,11 @@ failed_rollback() {
 }
 
 check_rollback_availability() {
-    if printf '%s\0' "${apps_with_status[@]}" | grep -iFxqz "${app_name},operator"; then
+    if [[ $operator == true ]]; then
         echo_array+=("Error: $app_name contains an operator instance, and cannot be rolled back")
         return 1
     fi
-    if printf '%s\0' "${apps_with_status[@]}" | grep -iFxqz "${app_name},cnpg"; then
+    if [[ $cnpg == true ]]; then
         echo_array+=("Error: $app_name contains a CNPG deployment, and cannot be rolled back")
         echo_array+=("If this happens frequently, set a larger timeout, or set concurrency lower")
         echo_array+=("If needed, you should have a backup of the database to restore from")

functions/update/pre_process.sh

@@ -18,7 +18,7 @@ should_start_app() {
         return 0 
     fi
 
-    if printf '%s\0' "${apps_with_status[@]}" | grep -iFxqz "${app_name},stopAll-on" && [[ $startstatus == "ACTIVE" ]]; then
+    if [[ $stopAll == true && $startstatus == "ACTIVE" ]]; then
         return 0 
     fi
 
@@ -92,6 +92,12 @@ pre_process() {
     old_full_ver="${app_vars[2]}"
     new_full_ver="${app_vars[3]}"
     rollback_version="${app_vars[4]}"
+
+    export operator isStopped stopAll cnpg 
+    operator=$(printf '%s\0' "${apps_with_status[@]}" | grep -iFxqz "${app_name},operator" && echo true || echo false)
+    isStopped=$(printf '%s\0' "${apps_with_status[@]}" | grep -iFxqz "${app_name},isStopped-on" && echo true || echo false)
+    stopAll=$(printf '%s\0' "${apps_with_status[@]}" | grep -iFxqz "${app_name},stopAll-on" && echo true || echo false)
+    cnpg=$(printf '%s\0' "${apps_with_status[@]}" | grep -iFxqz "${app_name},cnpg" && echo true || echo false)
 
     echo_array+=("\n$app_name")
 
@@ -102,7 +108,7 @@ pre_process() {
         fi
     fi
 
-    if [[ $stop_before_update == true && "$startstatus" != "STOPPED" ]]; then
+    if [[ $operator == false && $stop_before_update == true && "$startstatus" != "STOPPED" ]]; then
         if ! update_stop_handler 'Stopping prior to update..'; then
             echo_array
             return

utils/check_filtered_apps.sh

@@ -7,7 +7,9 @@ check_filtered_apps() {
         local app_name=$1
 
         midclt call chart.release.get_instance "$app_name" | jq -r '
-            if .config.operator.enabled == true then
+            if .chart_metadata.name == "prometheus" then
+                .name + ",operator"
+            elif .catalog_train == "operators" then
                 .name + ",operator"
             else
                 empty

utils/stop_app.sh

@@ -33,7 +33,7 @@ handle_stop_code() {
             return 1
             ;;
         3)
-            echo "HeavyScript doesn't have the ability to stop Prometheus"
+            echo "Operators are not meant to be stopped"
             return 1
             ;;
     esac
@@ -42,7 +42,7 @@ handle_stop_code() {
 stop_app() {
     # Return 1 if cli command outright fails
     # Return 2 if timeout is reached
-    # Return 3 if app is a prometheus instance
+    # Return 3 if app is an operator 
 
     local stop_type app_name timeout status
     stop_type="$1"