🐛♻️Clusters-keeper: use private dns name instead of public IP (ITISFo…

…undation#5883)
matusdrobuliak66 · May 28, 2024 · a93de84 · a93de84
1 parent ae630cf
commit a93de84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/packages/aws-library/src/aws_library/ec2/client.py b/packages/aws-library/src/aws_library/ec2/client.py
@@ -199,11 +199,7 @@ async def start_aws_instance(
                     launch_time=instance["LaunchTime"],
                     id=instance["InstanceId"],
                     aws_private_dns=instance["PrivateDnsName"],
-                    aws_public_ip=(
-                        instance["PublicIpAddress"]
-                        if "PublicIpAddress" in instance
-                        else None
-                    ),
+                    aws_public_ip=instance.get("PublicIpAddress", None),
                     type=instance["InstanceType"],
                     state=instance["State"]["Name"],
                     tags=parse_obj_as(
@@ -263,11 +259,7 @@ async def get_instances(
                         launch_time=instance["LaunchTime"],
                         id=instance["InstanceId"],
                         aws_private_dns=instance["PrivateDnsName"],
-                        aws_public_ip=(
-                            instance["PublicIpAddress"]
-                            if "PublicIpAddress" in instance
-                            else None
-                        ),
+                        aws_public_ip=instance.get("PublicIpAddress", None),
                         type=instance["InstanceType"],
                         state=instance["State"]["Name"],
                         resources=ec2_instance_types[0].resources,

diff --git a/services/clusters-keeper/src/simcore_service_clusters_keeper/utils/dask.py b/services/clusters-keeper/src/simcore_service_clusters_keeper/utils/dask.py
@@ -7,7 +7,7 @@
 
 
 def get_scheduler_url(ec2_instance: EC2InstanceData) -> AnyUrl:
-    url: AnyUrl = parse_obj_as(AnyUrl, f"tls://{ec2_instance.aws_public_ip}:8786")
+    url: AnyUrl = parse_obj_as(AnyUrl, f"tls://{ec2_instance.aws_private_dns}:8786")
     return url