Delete the code for adding podAffinity to the frontend deployment as …

…it doesn't the socket

Signed-off-by: Ye Cao <caoye.cao@alibaba-inc.com>

coordinator/gscoordinator/cluster_builder.py

@@ -579,7 +579,7 @@ def get_interactive_frontend_container(self):
         container.resources = ResourceBuilder.get_resources(
             self._frontend_requests, None
         )
-        if self.self.vineyard_deployment_exists():
+        if self.vineyard_deployment_exists():
             socket_volume = self.get_vineyard_socket_volume()
             container.volume_mounts = [socket_volume[2]]
         return container

coordinator/gscoordinator/coordinator.py

@@ -912,7 +912,7 @@ def get_launcher(args):
             service_type=args.k8s_service_type,
             timeout_seconds=args.timeout_seconds,
             vineyard_cpu=args.k8s_vineyard_cpu,
-            vineyard_deployment=args.vineyard_deployment,
+            vineyard_deployment=args.k8s_vineyard_deployment,
             vineyard_image=args.k8s_vineyard_image,
             vineyard_mem=args.k8s_vineyard_mem,
             vineyard_shared_mem=args.vineyard_shared_mem,

coordinator/gscoordinator/kubernetes_launcher.py

@@ -459,11 +459,6 @@ def _create_engine_stateful_set(self):
     def _create_frontend_deployment(self):
         logger.info("Creating frontend pods...")
         deployment = self._engine_cluster.get_interactive_frontend_deployment()
-        if self.vineyard_deployment_exists():
-            # schedule frontend deployment to the same node with vineyard deployment
-            deployment = self._add_podAffinity_for_vineyard_deployment(
-                workload=deployment
-            )
         deployment.metadata.owner_references = self._owner_references
         response = self._apps_api.create_namespaced_deployment(
             self._namespace, deployment

python/graphscope/tests/kubernetes/test_demo_script.py

@@ -100,6 +100,11 @@ def gs_session_distributed():
 
 @pytest.fixture
 def create_vineyard_deployment_on_single_node():
+    try:
+        import vineyard
+    except ImportError:
+        raise RuntimeError("vineyard is not installed, please install vineyard first.")
+
     # create vineyard deployment on single node
     # set the replicas of vineyard and etcd to 1 as there is only one node in the cluster
     vineyard.deploy.vineyardctl.deploy.vineyard_deployment(
@@ -132,7 +137,11 @@ def gs_session_with_vineyard_deployment(create_vineyard_deployment_on_single_nod
 
 
 @pytest.fixture
-def create_vineyard_deployment_on_multiple_nodes(create_graphscope_namesapce):
+def create_vineyard_deployment_on_multiple_nodes():
+    try:
+        import vineyard
+    except ImportError:
+        raise RuntimeError("vineyard is not installed, please install vineyard first.")
     # create vineyard deployment on multiple nodes
     # set the replicas of vineyard and etcd to 2 as there are 2 nodes in the kubernetes cluster
     vineyard.deploy.vineyardctl.deploy.vineyard_deployment(