cleanup: do some cleaning for the PR

cleanup

cleanup

cleanup

cleanup

Author: zhangddjs

aiopslab/orchestrator/orchestrator.py

@@ -3,7 +3,6 @@
 
 """Orchestrator class that interfaces with the agent and the environment."""
 
-from aiopslab.service.helm import Helm
 from aiopslab.service.kubectl import KubeCtl
 from aiopslab.session import Session
 from aiopslab.orchestrator.problems.registry import ProblemRegistry

aiopslab/service/apps/astronomy_shop.py

@@ -6,7 +6,6 @@
 from aiopslab.service.kubectl import KubeCtl
 from aiopslab.service.apps.base import Application
 from aiopslab.paths import ASTRONOMY_SHOP_METADATA
-from aiopslab.paths import config
 
 
 class AstronomyShop(Application):
@@ -29,7 +28,6 @@ def deploy(self):
             "open-telemetry",
             "https://open-telemetry.github.io/opentelemetry-helm-charts",
         )
-        
         Helm.install(**self.helm_configs)
         Helm.assert_if_deployed(self.helm_configs["namespace"])
 

aiopslab/service/apps/flight_ticket.py

@@ -4,9 +4,7 @@
 from aiopslab.service.helm import Helm
 from aiopslab.service.kubectl import KubeCtl
 from aiopslab.service.apps.base import Application
-from aiopslab.paths import TARGET_MICROSERVICES
 from aiopslab.paths import FLIGHT_TICKET_METADATA
-from aiopslab.paths import config
 
 
 class FlightTicket(Application):
@@ -29,7 +27,6 @@ def deploy(self):
             "flight-ticket",
             "https://xlab-uiuc.github.io/flight-ticket",
         )
-        
         Helm.install(**self.helm_configs)
         Helm.assert_if_deployed(self.helm_configs["namespace"])
 

aiopslab/service/apps/socialnet.py

@@ -8,7 +8,6 @@
 from aiopslab.service.apps.base import Application
 from aiopslab.paths import TARGET_MICROSERVICES
 from aiopslab.paths import SOCIAL_NETWORK_METADATA
-from aiopslab.paths import config
 
 
 class SocialNetwork(Application):
@@ -48,11 +47,11 @@ def deploy(self):
         node_architectures = self.kubectl.get_node_architectures()
         is_arm = any(arch in ["arm64", "aarch64"] for arch in node_architectures)
 
-        if "extra_args" not in self.helm_configs:
-            self.helm_configs["extra_args"] = []
-
         if is_arm:
             # Use the ARM-compatible image for media-frontend
+            if "extra_args" not in self.helm_configs:
+                self.helm_configs["extra_args"] = []
+
             self.helm_configs["extra_args"].append(
                 "--set media-frontend.container.image=jacksonarthurclark/media-frontend"
             )

aiopslab/service/apps/tidb_cluster_operator.py

@@ -5,7 +5,6 @@
 from aiopslab.service.kubectl import KubeCtl
 from aiopslab.service.apps.base import Application
 from aiopslab.paths import TIDB_METADATA
-from aiopslab.paths import config
 
 
 class TiDBCluster(Application):

aiopslab/service/apps/train_ticket.py

@@ -4,9 +4,7 @@
 from aiopslab.service.helm import Helm
 from aiopslab.service.kubectl import KubeCtl
 from aiopslab.service.apps.base import Application
-from aiopslab.paths import TARGET_MICROSERVICES
 from aiopslab.paths import TRAIN_TICKET_METADATA
-from aiopslab.paths import config
 
 
 class TrainTicket(Application):
@@ -25,7 +23,6 @@ def load_app_json(self):
     def deploy(self):
         """Deploy the Helm configurations."""
         self.kubectl.create_namespace_if_not_exist(self.namespace)
-        
         Helm.install(**self.helm_configs)
         Helm.assert_if_deployed(self.helm_configs["namespace"])
 

aiopslab/service/helm.py

@@ -4,9 +4,9 @@
 """Interface for helm operations"""
 
 import subprocess
-import time
 
 from aiopslab.service.kubectl import KubeCtl
+from aiopslab.paths import config
 
 
 class Helm:

aiopslab/service/telemetry/prometheus.py

@@ -4,12 +4,10 @@
 import os
 import json
 import yaml
-import time
 from subprocess import CalledProcessError
 from aiopslab.service.helm import Helm
 from aiopslab.service.kubectl import KubeCtl
 from aiopslab.paths import PROMETHEUS_METADATA, BASE_DIR
-from aiopslab.paths import config
 
 
 class Prometheus: