paasta-tools 1.13.3__tar.gz → 1.13.4__tar.gz

{paasta-tools-1.13.3/paasta_tools.egg-info → paasta-tools-1.13.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: paasta-tools
-Version: 1.13.3
+Version: 1.13.4
 Summary: Tools for Yelps SOA infrastructure
 Home-page: UNKNOWN
 Author: Compute Infrastructure @ Yelp

{paasta-tools-1.13.3 → paasta-tools-1.13.4}/paasta_tools/__init__.py

@@ -17,4 +17,4 @@
 # setup phase, the dependencies may not exist on disk yet.
 #
 # Don't bump version manually. See `make release` docs in ./Makefile
-__version__ = "1.13.3"
+__version__ = "1.13.4"

{paasta-tools-1.13.3 → paasta-tools-1.13.4}/paasta_tools/cli/cmds/spark_run.py

@@ -7,6 +7,7 @@ import shlex
 import socket
 import sys
 from typing import Any
+from typing import cast
 from typing import Dict
 from typing import List
 from typing import Mapping
@@ -1253,7 +1254,7 @@ def paasta_spark_run(args: argparse.Namespace) -> int:
         paasta_pool=args.pool,
         paasta_service=args.service,
         paasta_instance=paasta_instance,
-        extra_volumes=volumes,
+        extra_volumes=cast(List[Mapping[str, str]], volumes),
         aws_creds=aws_creds,
         aws_region=args.aws_region,
         force_spark_resource_configs=args.force_spark_resource_configs,

{paasta-tools-1.13.3 → paasta-tools-1.13.4}/paasta_tools/spark_tools.py

@@ -234,11 +234,31 @@ def get_spark_driver_monitoring_annotations(
     """
     Returns Spark driver pod annotations - currently used for Prometheus metadata.
     """
-    ui_port_str = str(spark_config.get("spark.ui.port", ""))
-    annotations = {
-        "prometheus.io/port": ui_port_str,
-        "prometheus.io/path": "/metrics/prometheus",
-    }
+    annotations: Dict[str, str] = {}
+
+    ui_port_str = spark_config.get("spark.ui.port")
+    if ui_port_str:
+        annotations.update(
+            {
+                "prometheus.io/port": ui_port_str,
+                "prometheus.io/path": "/metrics/prometheus",
+            }
+        )
+
+    paasta_service_non_truncated = spark_config.get(
+        "spark.kubernetes.executor.annotation.paasta.yelp.com/service"
+    )
+    paasta_instance_non_truncated = spark_config.get(
+        "spark.kubernetes.executor.annotation.paasta.yelp.com/instance"
+    )
+    if paasta_service_non_truncated and paasta_instance_non_truncated:
+        annotations.update(
+            {
+                "paasta.yelp.com/service": paasta_service_non_truncated,
+                "paasta.yelp.com/instance": paasta_instance_non_truncated,
+            }
+        )
+
     return annotations
 
 

{paasta-tools-1.13.3 → paasta-tools-1.13.4}/paasta_tools/tron_tools.py

@@ -20,6 +20,7 @@ import pkgutil
 import re
 import subprocess
 from string import Formatter
+from typing import cast
 from typing import List
 from typing import Mapping
 from typing import Tuple
@@ -358,9 +359,12 @@ class TronActionConfig(InstanceConfig):
             paasta_service=self.get_service(),
             paasta_instance=self.get_instance(),
             docker_img=f"{self.get_docker_registry()}/$PAASTA_DOCKER_IMAGE",
-            extra_volumes=self.get_volumes(
-                system_paasta_config.get_volumes(),
-                uses_bulkdata_default=system_paasta_config.get_uses_bulkdata_default(),
+            extra_volumes=cast(
+                List[Mapping[str, str]],
+                self.get_volumes(
+                    system_paasta_config.get_volumes(),
+                    uses_bulkdata_default=system_paasta_config.get_uses_bulkdata_default(),
+                ),
             ),
             use_eks=True,
             k8s_server_address=get_k8s_url_for_cluster(self.get_cluster()),

{paasta-tools-1.13.3 → paasta-tools-1.13.4/paasta_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: paasta-tools
-Version: 1.13.3
+Version: 1.13.4
 Summary: Tools for Yelps SOA infrastructure
 Home-page: UNKNOWN
 Author: Compute Infrastructure @ Yelp

{paasta-tools-1.13.3 → paasta-tools-1.13.4}/paasta_tools.egg-info/requires.txt

@@ -49,7 +49,7 @@ requests-cache>=0.4.10
 retry
 ruamel.yaml
 sensu-plugin
-service-configuration-lib>=3.0.0
+service-configuration-lib>=3.1.1
 signalfx
 slackclient>=1.2.1
 sticht>=1.1.0

{paasta-tools-1.13.3 → paasta-tools-1.13.4}/requirements-minimal.txt

@@ -56,7 +56,7 @@ requests-cache >= 0.4.10
 retry
 ruamel.yaml
 sensu-plugin
-service-configuration-lib >= 3.0.0
+service-configuration-lib >= 3.1.1
 signalfx
 slackclient >= 1.2.1
 sticht >= 1.1.0