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

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

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

{paasta-tools-1.14.2 → paasta-tools-1.14.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.14.2"
+__version__ = "1.14.4"

{paasta-tools-1.14.2 → paasta-tools-1.14.4}/paasta_tools/kubernetes/bin/paasta_cleanup_remote_run_resources.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import argparse
+import logging
 from datetime import datetime
 from datetime import timedelta
 from datetime import timezone
@@ -30,15 +31,19 @@ from paasta_tools.kubernetes_tools import KubeClient
 
 ListingFuncType = Callable[[KubeClient, str], Sequence[Any]]
 DeletionFuncType = Callable[[str, str], Any]
+log = logging.getLogger(__name__)
 
 
-def clean_namespace(kube_client: KubeClient, namespace: str, age_limit: datetime):
+def clean_namespace(
+    kube_client: KubeClient, namespace: str, age_limit: datetime, dry_run: bool = False
+):
     """Clean ephemeral remote-run resource in a namespace
 
     :param KubeClient kube_client: kubernetes client
     :param str namepsace: kubernetes namespace
     :param datetime age_limit: expiration time for resources
     """
+    dry_run_msg = " (dry_run)" if dry_run else ""
     cleanup_actions: Sequence[Tuple[DeletionFuncType, ListingFuncType]] = (
         (
             kube_client.core.delete_namespaced_service_account,
@@ -54,7 +59,9 @@ def clean_namespace(kube_client: KubeClient, namespace: str, age_limit: datetime
                 or entity.metadata.creation_timestamp > age_limit
             ):
                 continue
-            delete_func(entity.metadata.name, namespace)
+            log.info(f"Deleting {entity.metadata.name} in {namespace}{dry_run_msg}")
+            if not dry_run:
+                delete_func(entity.metadata.name, namespace)
 
 
 def parse_args() -> argparse.Namespace:
@@ -68,15 +75,30 @@ def parse_args() -> argparse.Namespace:
         default=600,
         help="Maximum age, in seconds, resources are allowed to have",
     )
+    parser.add_argument(
+        "-n",
+        "--dry-run",
+        action="store_true",
+        default=False,
+        help="Do not actually delete resources",
+    )
+    parser.add_argument(
+        "-v",
+        "--verbose",
+        action="store_true",
+        default=False,
+        help="More verbose logging",
+    )
     return parser.parse_args()
 
 
 def main():
     args = parse_args()
+    logging.basicConfig(level=logging.DEBUG if args.verbose else logging.INFO)
     kube_client = KubeClient()
     age_limit = datetime.now(tz=timezone.utc) - timedelta(seconds=args.max_age)
     for namespace in get_all_managed_namespaces(kube_client):
-        clean_namespace(kube_client, namespace, age_limit)
+        clean_namespace(kube_client, namespace, age_limit, args.dry_run)
 
 
 if __name__ == "__main__":

{paasta-tools-1.14.2 → paasta-tools-1.14.4}/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(
@@ -372,7 +372,7 @@ def create_pod_scoped_role(
             labels={POD_OWNER_LABEL: user},
         ),
     )
-    kube_client.core.create_namespaced_role(namespace=namespace, body=role)
+    kube_client.rbac.create_namespaced_role(namespace=namespace, body=role)
     return role_name
 
 

{paasta-tools-1.14.2 → paasta-tools-1.14.4}/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.4/paasta_tools.egg-info}/PKG-INFO

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