paasta-tools 1.16.0__tar.gz → 1.16.2__tar.gz

paasta-tools-1.16.2/LICENSE

@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright 2015-2016 Yelp Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

{paasta-tools-1.16.0/paasta_tools.egg-info → paasta-tools-1.16.2}/PKG-INFO

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

{paasta-tools-1.16.0 → paasta-tools-1.16.2}/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.16.0"
+__version__ = "1.16.2"

{paasta-tools-1.16.0 → paasta-tools-1.16.2}/paasta_tools/api/views/remote_run.py

@@ -17,20 +17,18 @@ from pyramid.view import view_config
 
 from paasta_tools.api import settings
 from paasta_tools.api.views.exception import ApiFailure
+from paasta_tools.kubernetes.remote_run import get_max_job_duration_limit
 from paasta_tools.kubernetes.remote_run import remote_run_ready
 from paasta_tools.kubernetes.remote_run import remote_run_start
 from paasta_tools.kubernetes.remote_run import remote_run_stop
 from paasta_tools.kubernetes.remote_run import remote_run_token
-from paasta_tools.utils import load_system_paasta_config
 
 
 DEFAULT_MAX_DURATION = 60 * 60  # 1 hour
-DEFAULT_MAX_DURATION_LIMIT = 8 * 60 * 60  # 8 hours
 
 
 @view_config(route_name="remote_run.start", request_method="POST", renderer="json")
 def view_remote_run_start(request):
-    system_config = load_system_paasta_config()
     service = request.swagger_data["service"]
     instance = request.swagger_data["instance"]
     user = request.swagger_data["json_body"]["user"]
@@ -38,7 +36,7 @@ def view_remote_run_start(request):
     recreate = request.swagger_data["json_body"].get("recreate", False)
     max_duration = min(
         request.swagger_data["json_body"].get("max_duration", DEFAULT_MAX_DURATION),
-        system_config.get_remote_run_duration_limit(DEFAULT_MAX_DURATION_LIMIT),
+        get_max_job_duration_limit(),
     )
     try:
         return remote_run_start(

{paasta-tools-1.16.0 → paasta-tools-1.16.2}/paasta_tools/instance/kubernetes.py

@@ -294,7 +294,11 @@ async def get_backends_from_mesh_status(
 ) -> Set[str]:
     status = await mesh_status_task
     if status.get("locations"):
-        backends = {be["address"] for be in status["locations"][0].get("backends", [])}
+        backends = {
+            be["address"]
+            for location in status["locations"]
+            for be in location.get("backends", [])
+        }
     else:
         backends = set()
 

{paasta-tools-1.16.0 → paasta-tools-1.16.2}/paasta_tools/kubernetes/bin/paasta_cleanup_remote_run_resources.py

@@ -22,6 +22,8 @@ from typing import Callable
 from typing import Sequence
 from typing import Tuple
 
+from paasta_tools.kubernetes.remote_run import get_max_job_duration_limit
+from paasta_tools.kubernetes.remote_run import get_remote_run_jobs
 from paasta_tools.kubernetes.remote_run import get_remote_run_role_bindings
 from paasta_tools.kubernetes.remote_run import get_remote_run_roles
 from paasta_tools.kubernetes.remote_run import get_remote_run_service_accounts
@@ -35,24 +37,44 @@ log = logging.getLogger(__name__)
 
 
 def clean_namespace(
-    kube_client: KubeClient, namespace: str, age_limit: datetime, dry_run: bool = False
+    kube_client: KubeClient,
+    namespace: str,
+    auth_age_limit: datetime,
+    job_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
+    :param datetime auth_age_limit: expiration time for authentication resources
+    :param datetime job_age_limit: expiration time for job resources
+    :param bool dry_run: delete resources for real or not
     """
     dry_run_msg = " (dry_run)" if dry_run else ""
-    cleanup_actions: Sequence[Tuple[DeletionFuncType, ListingFuncType]] = (
+    cleanup_actions: Sequence[Tuple[DeletionFuncType, ListingFuncType, datetime]] = (
         (
             kube_client.core.delete_namespaced_service_account,
             get_remote_run_service_accounts,
+            auth_age_limit,
+        ),
+        (
+            kube_client.rbac.delete_namespaced_role,
+            get_remote_run_roles,
+            auth_age_limit,
+        ),
+        (
+            kube_client.rbac.delete_namespaced_role_binding,
+            get_remote_run_role_bindings,
+            auth_age_limit,
+        ),
+        (
+            kube_client.batches.delete_namespaced_job,
+            get_remote_run_jobs,
+            job_age_limit,
         ),
-        (kube_client.rbac.delete_namespaced_role, get_remote_run_roles),
-        (kube_client.rbac.delete_namespaced_role_binding, get_remote_run_role_bindings),
     )
-    for delete_func, list_func in cleanup_actions:
+    for delete_func, list_func, age_limit in cleanup_actions:
         for entity in list_func(kube_client, namespace):
             if (
                 not entity.metadata.name.startswith("remote-run-")
@@ -96,9 +118,17 @@ 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)
+    now = datetime.now(tz=timezone.utc)
+    age_limit = now - timedelta(seconds=args.max_age)
+    job_age_limit = now - timedelta(seconds=get_max_job_duration_limit())
     for namespace in get_all_managed_namespaces(kube_client):
-        clean_namespace(kube_client, namespace, age_limit, args.dry_run)
+        clean_namespace(
+            kube_client,
+            namespace,
+            auth_age_limit=age_limit,
+            job_age_limit=job_age_limit,
+            dry_run=args.dry_run,
+        )
 
 
 if __name__ == "__main__":

{paasta-tools-1.16.0 → paasta-tools-1.16.2}/paasta_tools/kubernetes/remote_run.py

@@ -41,11 +41,13 @@ from paasta_tools.kubernetes_tools import JOB_TYPE_LABEL_NAME
 from paasta_tools.kubernetes_tools import KubeClient
 from paasta_tools.kubernetes_tools import limit_size_with_hash
 from paasta_tools.kubernetes_tools import paasta_prefixed
+from paasta_tools.utils import load_system_paasta_config
 
 
 logger = logging.getLogger(__name__)
 REMOTE_RUN_JOB_LABEL = "remote-run"
 POD_OWNER_LABEL = paasta_prefixed("pod_owner")
+DEFAULT_MAX_DURATION_LIMIT = 8 * 60 * 60  # 8 hours
 
 
 class RemoteRunError(Exception):
@@ -93,7 +95,7 @@ def remote_run_start(
     :param int max_duration: maximum allowed duration for the remote-ruh job
     :return: outcome of the operation, and resulting Kubernetes pod information
     """
-    kube_client = KubeClient(config_file="/etc/kubernetes/admin.conf")
+    kube_client = KubeClient()
 
     # Load the service deployment settings
     deployment_config = load_eks_service_config(service, instance, cluster)
@@ -149,7 +151,7 @@ def remote_run_ready(
     :param str job_name: name of the remote-run job to check
     :return: job status, with pod info
     """
-    kube_client = KubeClient(config_file="/etc/kubernetes/admin.conf")
+    kube_client = KubeClient()
 
     # Load the service deployment settings
     deployment_config = load_eks_service_config(service, instance, cluster)
@@ -182,7 +184,7 @@ def remote_run_stop(
     :param str user: the user requesting the remote-run sandbox
     :return: outcome of the operation
     """
-    kube_client = KubeClient(config_file="/etc/kubernetes/admin.conf")
+    kube_client = KubeClient()
 
     # Load the service deployment settings
     deployment_config = load_eks_service_config(service, instance, cluster)
@@ -216,7 +218,7 @@ def remote_run_token(
     :param str cluster: paasta cluster
     :param str user: the user requesting the remote-run sandbox
     """
-    kube_client = KubeClient(config_file="/etc/kubernetes/admin.conf")
+    kube_client = KubeClient()
 
     # Load the service deployment settings
     deployment_config = load_eks_service_config(service, instance, cluster)
@@ -419,11 +421,12 @@ def get_remote_run_roles(kube_client: KubeClient, namespace: str) -> List[V1Role
     """List all temporary roles related to remote-run
 
     :param KubeClient kube_client: Kubernetes client
-    :param str namespace: pod namespace
+    :param str namespace: role namespace
     :return: list of roles
     """
     return kube_client.rbac.list_namespaced_role(
-        namespace, label_selector=POD_OWNER_LABEL
+        namespace,
+        label_selector=POD_OWNER_LABEL,
     ).items
 
 
@@ -433,9 +436,31 @@ def get_remote_run_role_bindings(
     """List all temporary role bindings related to remote-run
 
     :param KubeClient kube_client: Kubernetes client
-    :param str namespace: pod namespace
+    :param str namespace: role namespace
     :return: list of roles
     """
     return kube_client.rbac.list_namespaced_role_binding(
-        namespace, label_selector=POD_OWNER_LABEL
+        namespace,
+        label_selector=POD_OWNER_LABEL,
+    ).items
+
+
+def get_remote_run_jobs(kube_client: KubeClient, namespace: str) -> List[V1Job]:
+    """List all remote-run jobs
+
+    :param KubeClient kube_client: Kubernetes client
+    :param str namespace: job namespace
+    """
+    return kube_client.batches.list_namespaced_job(
+        namespace,
+        label_selector=f"{paasta_prefixed(JOB_TYPE_LABEL_NAME)}={REMOTE_RUN_JOB_LABEL}",
     ).items
+
+
+def get_max_job_duration_limit() -> int:
+    """Get maximum configured duration for a remote run job
+
+    :return: max duration in seconds
+    """
+    system_config = load_system_paasta_config()
+    return system_config.get_remote_run_duration_limit(DEFAULT_MAX_DURATION_LIMIT)

{paasta-tools-1.16.0 → paasta-tools-1.16.2}/paasta_tools/kubernetes_tools.py

@@ -2088,6 +2088,7 @@ class KubernetesDeploymentConfig(LongRunningServiceConfig):
                 metadata=self.get_kubernetes_metadata(git_sha),
                 spec=V1JobSpec(
                     active_deadline_seconds=deadline_seconds,
+                    ttl_seconds_after_finished=0,  # remove job resource after completion
                     template=pod_template,
                 ),
             )

{paasta-tools-1.16.0 → paasta-tools-1.16.2/paasta_tools.egg-info}/PKG-INFO

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

{paasta-tools-1.16.0 → paasta-tools-1.16.2}/paasta_tools.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+LICENSE
 MANIFEST.in
 README.md
 pyproject.toml