fix: fixed the retry logic in enable_disable_ocp_console.sh (#603)

Author: imprateeksh

main.tf

@@ -460,7 +460,7 @@ resource "null_resource" "confirm_network_healthy" {
 ##############################################################################
 resource "null_resource" "ocp_console_management" {
 
-  depends_on = [ibm_container_vpc_cluster.cluster, ibm_container_vpc_cluster.autoscaling_cluster, ibm_container_vpc_worker_pool.pool, ibm_container_vpc_worker_pool.autoscaling_pool]
+  depends_on = [null_resource.confirm_network_healthy]
   triggers = {
     enable_ocp_console = var.enable_ocp_console
   }

scripts/enable_disable_ocp_console.sh

@@ -6,7 +6,6 @@ set -euo pipefail
 PATCH_APPLY="oc patch consoles.operator.openshift.io cluster --patch '{\"spec\":{\"managementState\":\"Managed\"}}' --type=merge"
 PATCH_REMOVE="oc patch consoles.operator.openshift.io cluster --patch '{\"spec\":{\"managementState\":\"Removed\"}}' --type=merge"
 MAX_ATTEMPTS=10
-RETRY_WAIT=5
 
 function check_oc_cli() {
   if ! command -v oc &> /dev/null; then
@@ -18,17 +17,18 @@ function check_oc_cli() {
 function apply_oc_patch() {
 
   local attempt=0
+  local retry_wait_time=5
+
   while [ $attempt -lt $MAX_ATTEMPTS ]; do
     echo "Attempt $((attempt+1)) of $MAX_ATTEMPTS: Applying OpenShift Console patch..."
 
     if eval "$PATCH_APPLY"; then
       echo "Patch applied successfully."
       return 0
     else
-      echo "Failed to apply patch. Retrying in ${RETRY_WAIT}s..."
-      sleep $RETRY_WAIT
+      echo "Failed to apply patch. Retrying in ${retry_wait_time}s..."
+      sleep $retry_wait_time
       ((attempt++))
-      RETRY_WAIT=$((RETRY_WAIT * 2))
     fi
   done
 
@@ -39,17 +39,18 @@ function apply_oc_patch() {
 function remove_oc_patch() {
 
   local attempt=0
+  local retry_wait_time=5
+
   while [ $attempt -lt $MAX_ATTEMPTS ]; do
     echo "Attempt $((attempt+1)) of $MAX_ATTEMPTS: Removing OpenShift Console patch..."
 
     if eval "$PATCH_REMOVE"; then
       echo "Patch removed successfully."
       return 0
     else
-      echo "Failed to remove patch. Retrying in ${RETRY_WAIT}s..."
-      sleep $RETRY_WAIT
+      echo "Failed to remove patch. Retrying in ${retry_wait_time}s..."
+      sleep $retry_wait_time
       ((attempt++))
-      RETRY_WAIT=$((RETRY_WAIT * 2))
     fi
   done
 
@@ -59,8 +60,8 @@ function remove_oc_patch() {
 
 echo "========================================="
 
-if [[ -z "${ENABLE_OCP_CONSOLE}" ]]; then
-    echo "ENABLE_OCP_CONSOLE must be set" >&2
+if [[ -z "${ENABLE_OCP_CONSOLE:-}" ]]; then
+    echo "ENABLE_OCP_CONSOLE must be set ... exiting." >&2
     exit 1
 fi