Fix/compare version (#57)

* fix compare version if provider and node is prefix

* right way to remove prefix

* remove specific versions while upgrading for hostname and inventory

* code correction

Author: devalpatel67

application/service/provider_service.py

@@ -343,7 +343,7 @@ def _check_akash_node_readiness(self, ssh_client, task_id: str):
         redis_client = get_redis_client()
         try:
             # First check if pod is running
-            pod_timeout = 600  # 10 minutes
+            pod_timeout = 1800  # 30 minutes
             sync_timeout = 6000  # 100 minutes
             check_interval = 10  # Check every 10 seconds
             start_time = time.time()

application/service/upgrade_service.py

@@ -218,10 +218,17 @@ async def upgrade_network(self, ssh_client, task_id: str) -> Dict:
                 # Upgrade akash-node deployment
                 log.info(f"Upgrading akash-node to version {app_version}...")
                 if app_needs_upgrade:
+                    run_ssh_command(
+                        ssh_client,
+                        "helm -n akash-services uninstall akash-node",
+                        True,
+                        task_id=task_id,
+                    )
                     if Config.CHAIN_ID == "akashnet-2":
-                        upgrade_command = f"helm upgrade --install akash-node akash/akash-node -n akash-services --set image.tag={app_version}"
+                        # Install a fresh akash-node release with desired version
+                        upgrade_command = f"helm -n akash-services install akash-node akash/akash-node --set image.tag={app_version}"
                     else:
-                        upgrade_command = f"helm upgrade --install akash-node akash-dev/akash-node -n akash-services --set image.tag={app_version} --devel"
+                        upgrade_command = f"helm -n akash-services install akash-node akash-dev/akash-node --set image.tag={app_version} --devel"
                 else:
                     upgrade_command = (
                         "kubectl delete pod -n akash-services -l app=akash-node"
@@ -318,12 +325,12 @@ async def upgrade_provider(self, ssh_client, task_id: str) -> Dict:
 
             # Upgrade hostname operator
             log.info("Upgrading hostname operator...")
-            akash_hostname_operator_cmd = f"helm -n akash-services upgrade akash-hostname-operator akash/akash-hostname-operator --set image.tag={app_version}" if Config.CHAIN_ID == "akashnet-2" else f"helm -n akash-services upgrade akash-hostname-operator akash-dev/akash-hostname-operator --set image.tag={app_version} --devel"
+            akash_hostname_operator_cmd = "helm -n akash-services upgrade akash-hostname-operator akash/akash-hostname-operator" if Config.CHAIN_ID == "akashnet-2" else "helm -n akash-services upgrade akash-hostname-operator akash-dev/akash-hostname-operator --devel"
             run_ssh_command(ssh_client, akash_hostname_operator_cmd, True, task_id=task_id)
 
             # Upgrade inventory operator
             log.info("Upgrading inventory operator...")
-            akash_inventory_operator_cmd = f"helm -n akash-services upgrade inventory-operator akash/akash-inventory-operator --set image.tag={app_version}" if Config.CHAIN_ID == "akashnet-2" else f"helm -n akash-services upgrade inventory-operator akash-dev/akash-inventory-operator --set image.tag={app_version} --devel"
+            akash_inventory_operator_cmd = "helm -n akash-services upgrade inventory-operator akash/akash-inventory-operator" if Config.CHAIN_ID == "akashnet-2" else "helm -n akash-services upgrade inventory-operator akash-dev/akash-inventory-operator --devel"
             run_ssh_command(ssh_client, akash_inventory_operator_cmd, True, task_id=task_id)
 
             # Update price script