paasta-tools 1.14.2__tar.gz → 1.14.3__tar.gz

{paasta-tools-1.14.2/paasta_tools.egg-info → paasta-tools-1.14.3}/PKG-INFO

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

{paasta-tools-1.14.2 → paasta-tools-1.14.3}/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.14.2"
+__version__ = "1.14.3"

{paasta-tools-1.14.2 → paasta-tools-1.14.3}/paasta_tools/kubernetes/remote_run.py

@@ -259,7 +259,7 @@ def find_job_pod(
     """
     selectors = (
         f"{paasta_prefixed(JOB_TYPE_LABEL_NAME)}={job_label}",
-        f"batch.kubernetes.io/job-name={job_name}",
+        f"job-name={job_name}",
     )
     for _ in range(retries):
         pod_list = kube_client.core.list_namespaced_pod(

{paasta-tools-1.14.2 → paasta-tools-1.14.3}/paasta_tools/kubernetes_tools.py

@@ -2066,33 +2066,32 @@ class KubernetesDeploymentConfig(LongRunningServiceConfig):
         :param bool include_sidecars: do not discard sidecar containers when building pod spec
         :return: job object
         """
+        additional_labels = {paasta_prefixed(JOB_TYPE_LABEL_NAME): job_label}
         try:
             docker_url = self.get_docker_url()
             git_sha = get_git_sha_from_dockerurl(docker_url, long=True)
             system_paasta_config = load_system_paasta_config()
+            image_version = self.get_image_version()
+            if image_version is not None:
+                additional_labels[paasta_prefixed("image_version")] = image_version
+            pod_template = self.get_pod_template_spec(
+                git_sha=git_sha,
+                system_paasta_config=system_paasta_config,
+                restart_on_failure=False,
+                include_sidecars=include_sidecars,
+                force_no_routable_ip=not keep_routable_ip,
+            )
+            pod_template.metadata.labels.update(additional_labels)
             complete_config = V1Job(
                 api_version="batch/v1",
                 kind="Job",
                 metadata=self.get_kubernetes_metadata(git_sha),
                 spec=V1JobSpec(
                     active_deadline_seconds=deadline_seconds,
-                    template=self.get_pod_template_spec(
-                        git_sha=git_sha,
-                        system_paasta_config=system_paasta_config,
-                        restart_on_failure=False,
-                        include_sidecars=include_sidecars,
-                        force_no_routable_ip=not keep_routable_ip,
-                    ),
+                    template=pod_template,
                 ),
             )
-            image_version = self.get_image_version()
-            if image_version is not None:
-                complete_config.metadata.labels[
-                    "paasta.yelp.com/image_version"
-                ] = image_version
-            complete_config.metadata.labels[
-                paasta_prefixed(JOB_TYPE_LABEL_NAME)
-            ] = job_label
+            complete_config.metadata.labels.update(additional_labels)
         except Exception as e:
             raise InvalidKubernetesConfig(e, self.get_service(), self.get_instance())
         log.debug(

{paasta-tools-1.14.2 → paasta-tools-1.14.3/paasta_tools.egg-info}/PKG-INFO

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