paasta-tools 1.26.1__py3-none-any.whl → 1.28.0__py3-none-any.whl

paasta_tools/paastaapi/model/autoscaling_override.py

@@ -59,9 +59,6 @@ class AutoscalingOverride(ModelNormal):
     }
 
     validations = {
-        ('min_instances',): {
-            'inclusive_minimum': 1,
-        },
     }
 
     additional_properties_type = None
@@ -79,7 +76,8 @@ class AutoscalingOverride(ModelNormal):
                 and the value is attribute type.
         """
         return {
-            'min_instances': (int,),  # noqa: E501
+            'min_instances': (int, none_type,),  # noqa: E501
+            'max_instances': (int, none_type,),  # noqa: E501
             'expire_after': (float,),  # noqa: E501
         }
 
@@ -90,6 +88,7 @@ class AutoscalingOverride(ModelNormal):
 
     attribute_map = {
         'min_instances': 'min_instances',  # noqa: E501
+        'max_instances': 'max_instances',  # noqa: E501
         'expire_after': 'expire_after',  # noqa: E501
     }
 
@@ -105,11 +104,12 @@ class AutoscalingOverride(ModelNormal):
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, min_instances, expire_after, *args, **kwargs):  # noqa: E501
+    def __init__(self, min_instances, max_instances, expire_after, *args, **kwargs):  # noqa: E501
         """AutoscalingOverride - a model defined in OpenAPI
 
         Args:
-            min_instances (int): Minimum number of instances to run
+            min_instances (int, none_type): Minimum number of instances to run
+            max_instances (int, none_type): Maximum number of instances to run
             expire_after (float): Unix timestamp when this override is no longer valid
 
         Keyword Args:
@@ -169,6 +169,7 @@ class AutoscalingOverride(ModelNormal):
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
         self.min_instances = min_instances
+        self.max_instances = max_instances
         self.expire_after = expire_after
         for var_name, var_value in kwargs.items():
             if var_name not in self.attribute_map and \

paasta_tools/paastaapi/model/inline_response202.py

@@ -78,7 +78,8 @@ class InlineResponse202(ModelNormal):
         return {
             'service': (str,),  # noqa: E501
             'instance': (str,),  # noqa: E501
-            'min_instances': (int,),  # noqa: E501
+            'min_instances': (int, none_type,),  # noqa: E501
+            'max_instances': (int, none_type,),  # noqa: E501
             'expire_after': (float,),  # noqa: E501
             'status': (str,),  # noqa: E501
         }
@@ -92,6 +93,7 @@ class InlineResponse202(ModelNormal):
         'service': 'service',  # noqa: E501
         'instance': 'instance',  # noqa: E501
         'min_instances': 'min_instances',  # noqa: E501
+        'max_instances': 'max_instances',  # noqa: E501
         'expire_after': 'expire_after',  # noqa: E501
         'status': 'status',  # noqa: E501
     }
@@ -144,7 +146,8 @@ class InlineResponse202(ModelNormal):
                                 _visited_composed_classes = (Animal,)
             service (str): Service name. [optional]  # noqa: E501
             instance (str): Instance name. [optional]  # noqa: E501
-            min_instances (int): Minimum number of instances to run. [optional]  # noqa: E501
+            min_instances (int, none_type): Minimum number of instances to run. [optional]  # noqa: E501
+            max_instances (int, none_type): Maximum number of instances to run. [optional]  # noqa: E501
             expire_after (float): Unix timestamp after which the override is no longer valid. [optional]  # noqa: E501
             status (str): Status of the operation. [optional]  # noqa: E501
         """

paasta_tools/remote_git.py

@@ -72,8 +72,8 @@ def create_remote_refs(git_url, ref_mutator, force=False):
         determine_wants = ref_mutator
     # We know we don't need to push any objects.
 
-    def generate_pack_contents(have, want):
-        return []
+    def generate_pack_contents(have, want, ofs_delta=None):
+        return 0, []
 
     return client.send_pack(path, determine_wants, generate_pack_contents)
 

paasta_tools/run-paasta-api-in-dev-mode.py

@@ -45,8 +45,8 @@ def main():
             api.main("dev-mode")
     else:
         os.execl(
-            ".tox/py38-linux/bin/python",
-            ".tox/py38-linux/bin/python",
+            ".tox/py310-linux/bin/python",
+            ".tox/py310-linux/bin/python",
             "-m",
             "paasta_tools.api.api",
             *["-D", "-c", cluster, str(port)],

paasta_tools/run-paasta-api-playground.py

@@ -39,8 +39,8 @@ def main():
             api.main("dev-mode")
     else:
         os.execl(
-            ".tox/py38-linux/bin/python",
-            ".tox/py38-linux/bin/python",
+            ".tox/py310-linux/bin/python",
+            ".tox/py310-linux/bin/python",
             "-m",
             "paasta_tools.api.api",
             *["-D", "-c", cluster, str(port)],

paasta_tools/setup_kubernetes_job.py

@@ -255,27 +255,31 @@ def get_hpa_overrides(kube_client: KubeClient) -> Dict[str, Dict[str, HpaOverrid
 
     This function reads the "paasta-autoscaling-overrides" ConfigMap in the "paasta" namespace
     and extracts all valid (non-expired) overrides to return a dictionary mapping
-    service.instance pairs to override data (currently, just min_instances and when the
+    service.instance pairs to override data (currently, just {min,max_instances} and when the
     override should expire by).
 
     The incoming ConfigMap is expected to have the following format:
     {
         $SERVICE_A.$INSTANCE_A: {
             "min_instances": 2,
+            "m_instances": 2,
             "expire_after": "2023-10-01T00:00:00Z"
         },
         $SERVICE_A.$INSTANCE_B: {
             "min_instances": 3,
+            "max_instances": 10,
             "expire_after": "2023-10-01T00:00:00Z"
         },
             ...
         },
         $SERVICE_B.$INSTANCE_A: {
             "min_instances": 1,
+            "max_instances": 11,
             "expire_after": "2023-10-01T00:00:00Z"
         },
         $SERVICE_B.$INSTANCE_B: {
             "min_instances": 2,
+            "max_instances": 20,
             "expire_after": "2023-10-01T00:00:00Z"
         },
         ...
@@ -298,19 +302,21 @@ def get_hpa_overrides(kube_client: KubeClient) -> Dict[str, Dict[str, HpaOverrid
                     override_metadata = json.loads(override_json)
                     expire_after = override_metadata.get("expire_after")
                     min_instances = override_metadata.get("min_instances")
+                    max_instances = override_metadata.get("max_instances")
 
-                    if expire_after and min_instances:
+                    if expire_after and (min_instances or max_instances):
                         if current_time < expire_after:
                             if service not in overrides:
                                 overrides[service] = {}
 
                             overrides[service][instance] = {
                                 "min_instances": min_instances,
+                                "max_instances": max_instances,
                                 "expire_after": expire_after,
                             }
                             log.info(
                                 f"Found valid HPA override for {service}: "
-                                f"{override_metadata.get('min_instances')} (expires at {expire_after})"
+                                f"min_instances: {max_instances} :: max_instances {min_instances} (expires at {expire_after})"
                             )
                         else:
                             log.info(
@@ -320,7 +326,7 @@ def get_hpa_overrides(kube_client: KubeClient) -> Dict[str, Dict[str, HpaOverrid
                     else:
                         log.warning(
                             f"Invalid HPA override for {service}.{instance}: "
-                            f"missing 'min_instances' or 'expire_after': {override_metadata}"
+                            f"missing 'min_instances' or 'max_instances' or 'expire_after': {override_metadata}"
                         )
                 except Exception:
                     log.exception(

paasta_tools/yaml_tools.py

@@ -2,7 +2,7 @@ import sys
 
 import yaml
 
-# try and catch both /opt/venvs/paasta-tools and ~/pg/paasta/.tox/py38-linux as if we're being run as an application,
+# try and catch both /opt/venvs/paasta-tools and ~/pg/paasta/.tox/py310-linux as if we're being run as an application,
 # we likely want to fail on a potential slowdown rather than experience a performance regression
 if "paasta" in sys.prefix:
     from yaml import CSafeLoader as Loader

{paasta_tools-1.26.1.data → paasta_tools-1.28.0.data}/scripts/ide_helper.py

@@ -53,12 +53,12 @@ def install_vscode_support() -> None:
                 "python": "${workspaceFolder}/.paasta/bin/python",
                 "program": "${workspaceFolder}/.paasta/bin/tox",
                 "subProcess": True,
-                "args": ["-e", "py38-linux,docs,mypy,tests"],
+                "args": ["-e", "py310-linux,docs,mypy,tests"],
             },
             {
                 "name": "paasta cli",
                 "cwd": "${workspaceFolder}",
-                "python": "${workspaceFolder}/.tox/py38-linux/bin/python",
+                "python": "${workspaceFolder}/.tox/py310-linux/bin/python",
                 "type": "python",
                 "request": "launch",
                 "module": "paasta_tools.cli.cli",
@@ -66,7 +66,7 @@ def install_vscode_support() -> None:
             {
                 "name": "paasta rollback",
                 "cwd": "${workspaceFolder}",
-                "python": "${workspaceFolder}/.tox/py38-linux/bin/python",
+                "python": "${workspaceFolder}/.tox/py310-linux/bin/python",
                 "type": "python",
                 "request": "launch",
                 "module": "paasta_tools.cli.cli",
@@ -83,7 +83,7 @@ def install_vscode_support() -> None:
             {
                 "name": "paasta mark-for-deployment",
                 "cwd": "${workspaceFolder}",
-                "python": "${workspaceFolder}/.tox/py38-linux/bin/python",
+                "python": "${workspaceFolder}/.tox/py310-linux/bin/python",
                 "type": "python",
                 "request": "launch",
                 "module": "paasta_tools.cli.cli",
@@ -101,7 +101,7 @@ def install_vscode_support() -> None:
             {
                 "name": "paasta status",
                 "cwd": "${workspaceFolder}",
-                "python": "${workspaceFolder}/.tox/py38-linux/bin/python",
+                "python": "${workspaceFolder}/.tox/py310-linux/bin/python",
                 "type": "python",
                 "request": "launch",
                 "module": "paasta_tools.cli.cli",
@@ -118,7 +118,7 @@ def install_vscode_support() -> None:
             {
                 "name": "paasta playground",
                 "cwd": "${workspaceFolder}",
-                "python": "${workspaceFolder}/.tox/py38-linux/bin/python",
+                "python": "${workspaceFolder}/.tox/py310-linux/bin/python",
                 "type": "python",
                 "request": "launch",
                 "module": "paasta_tools.cli.cli",
@@ -138,7 +138,7 @@ def install_vscode_support() -> None:
             {
                 "name": "paasta status playground",
                 "cwd": "${workspaceFolder}",
-                "python": "${workspaceFolder}/.tox/py38-linux/bin/python",
+                "python": "${workspaceFolder}/.tox/py310-linux/bin/python",
                 "type": "python",
                 "request": "launch",
                 "module": "paasta_tools.cli.cli",
@@ -157,7 +157,7 @@ def install_vscode_support() -> None:
             {
                 "name": "paasta logs",
                 "cwd": "${workspaceFolder}",
-                "python": "${workspaceFolder}/.tox/py38-linux/bin/python",
+                "python": "${workspaceFolder}/.tox/py310-linux/bin/python",
                 "type": "python",
                 "request": "launch",
                 "module": "paasta_tools.cli.cli",
@@ -175,7 +175,7 @@ def install_vscode_support() -> None:
                 "name": "paasta validate",
                 # This command has to be ran from inside the service repo in yelpsoa-configs
                 "cwd": "${userHome}/pg/yelpsoa-configs/",
-                "python": "${workspaceFolder}/.tox/py38-linux/bin/python",
+                "python": "${workspaceFolder}/.tox/py310-linux/bin/python",
                 "type": "python",
                 "request": "launch",
                 "module": "paasta_tools.cli.cli",
@@ -184,10 +184,10 @@ def install_vscode_support() -> None:
             {
                 # 1) Follow step 1 in "Running the PaaSTA HTTP API Locally" wiki
                 # 2) Run this "paasta API" test to debug paasta API
-                # 3) Run client command, e.g. PAASTA_SYSTEM_CONFIG_DIR=./etc_paasta_for_development/  .tox/py38-linux/bin/python paasta_tools/cli/cli.py status --clusters norcal-devc --service katamari_test_service
+                # 3) Run client command, e.g. PAASTA_SYSTEM_CONFIG_DIR=./etc_paasta_for_development/  .tox/py310-linux/bin/python paasta_tools/cli/cli.py status --clusters norcal-devc --service katamari_test_service
                 "name": "paasta API",
                 "cwd": "${workspaceFolder}",
-                "python": "${workspaceFolder}/.tox/py38-linux/bin/python",
+                "python": "${workspaceFolder}/.tox/py310-linux/bin/python",
                 "type": "python",
                 "request": "launch",
                 "module": "paasta_tools.run-paasta-api-in-dev-mode",
@@ -203,7 +203,7 @@ def install_vscode_support() -> None:
             {
                 "name": "paasta API playground",
                 "cwd": "${workspaceFolder}",
-                "python": "${workspaceFolder}/.tox/py38-linux/bin/python",
+                "python": "${workspaceFolder}/.tox/py310-linux/bin/python",
                 "type": "python",
                 "request": "launch",
                 "module": "paasta_tools.run-paasta-api-playground",
@@ -221,7 +221,7 @@ def install_vscode_support() -> None:
             {
                 "name": "Run setup k8s job in playground",
                 "cwd": "${workspaceFolder}",
-                "python": "${workspaceFolder}/.tox/py38-linux/bin/python",
+                "python": "${workspaceFolder}/.tox/py310-linux/bin/python",
                 "type": "python",
                 "request": "launch",
                 "module": "paasta_tools.setup_kubernetes_job",
@@ -244,7 +244,7 @@ def install_vscode_support() -> None:
             {
                 "name": "Generate deployments.json in playground",
                 "cwd": "${workspaceFolder}",
-                "python": "${workspaceFolder}/.tox/py38-linux/bin/python",
+                "python": "${workspaceFolder}/.tox/py310-linux/bin/python",
                 "type": "python",
                 "request": "launch",
                 "module": "paasta_tools.generate_deployments_for_service",

{paasta_tools-1.26.1.data → paasta_tools-1.28.0.data}/scripts/setup_kubernetes_job.py

@@ -255,27 +255,31 @@ def get_hpa_overrides(kube_client: KubeClient) -> Dict[str, Dict[str, HpaOverrid
 
     This function reads the "paasta-autoscaling-overrides" ConfigMap in the "paasta" namespace
     and extracts all valid (non-expired) overrides to return a dictionary mapping
-    service.instance pairs to override data (currently, just min_instances and when the
+    service.instance pairs to override data (currently, just {min,max_instances} and when the
     override should expire by).
 
     The incoming ConfigMap is expected to have the following format:
     {
         $SERVICE_A.$INSTANCE_A: {
             "min_instances": 2,
+            "m_instances": 2,
             "expire_after": "2023-10-01T00:00:00Z"
         },
         $SERVICE_A.$INSTANCE_B: {
             "min_instances": 3,
+            "max_instances": 10,
             "expire_after": "2023-10-01T00:00:00Z"
         },
             ...
         },
         $SERVICE_B.$INSTANCE_A: {
             "min_instances": 1,
+            "max_instances": 11,
             "expire_after": "2023-10-01T00:00:00Z"
         },
         $SERVICE_B.$INSTANCE_B: {
             "min_instances": 2,
+            "max_instances": 20,
             "expire_after": "2023-10-01T00:00:00Z"
         },
         ...
@@ -298,19 +302,21 @@ def get_hpa_overrides(kube_client: KubeClient) -> Dict[str, Dict[str, HpaOverrid
                     override_metadata = json.loads(override_json)
                     expire_after = override_metadata.get("expire_after")
                     min_instances = override_metadata.get("min_instances")
+                    max_instances = override_metadata.get("max_instances")
 
-                    if expire_after and min_instances:
+                    if expire_after and (min_instances or max_instances):
                         if current_time < expire_after:
                             if service not in overrides:
                                 overrides[service] = {}
 
                             overrides[service][instance] = {
                                 "min_instances": min_instances,
+                                "max_instances": max_instances,
                                 "expire_after": expire_after,
                             }
                             log.info(
                                 f"Found valid HPA override for {service}: "
-                                f"{override_metadata.get('min_instances')} (expires at {expire_after})"
+                                f"min_instances: {max_instances} :: max_instances {min_instances} (expires at {expire_after})"
                             )
                         else:
                             log.info(
@@ -320,7 +326,7 @@ def get_hpa_overrides(kube_client: KubeClient) -> Dict[str, Dict[str, HpaOverrid
                     else:
                         log.warning(
                             f"Invalid HPA override for {service}.{instance}: "
-                            f"missing 'min_instances' or 'expire_after': {override_metadata}"
+                            f"missing 'min_instances' or 'max_instances' or 'expire_after': {override_metadata}"
                         )
                 except Exception:
                     log.exception(

paasta_tools-1.28.0.dist-info/METADATA

@@ -0,0 +1,79 @@
+Metadata-Version: 2.4
+Name: paasta-tools
+Version: 1.28.0
+Summary: Tools for Yelps SOA infrastructure
+Author: Compute Infrastructure @ Yelp
+Author-email: compute-infra@yelp.com
+Provides: paasta_tools
+Requires-Python: >=3.8.0
+License-File: LICENSE
+Requires-Dist: a-sync>=0.5.0
+Requires-Dist: aiohttp>=3.5.4
+Requires-Dist: argcomplete>=0.8.1
+Requires-Dist: boto
+Requires-Dist: boto3
+Requires-Dist: boto3-type-annotations
+Requires-Dist: botocore
+Requires-Dist: bravado>=10.2.0
+Requires-Dist: certifi
+Requires-Dist: choice>=0.1
+Requires-Dist: containerd
+Requires-Dist: cookiecutter>=1.4.0
+Requires-Dist: croniter
+Requires-Dist: docker
+Requires-Dist: dulwich>=0.17.3
+Requires-Dist: environment-tools
+Requires-Dist: ephemeral-port-reserve>=1.0.1
+Requires-Dist: graphviz
+Requires-Dist: grpcio
+Requires-Dist: gunicorn
+Requires-Dist: humanfriendly
+Requires-Dist: humanize>=0.5.1
+Requires-Dist: inotify>=0.2.8
+Requires-Dist: ipaddress>=1.0.22
+Requires-Dist: isodate>=0.7.2
+Requires-Dist: jsonschema[format]
+Requires-Dist: kazoo>=2.0.0
+Requires-Dist: kubernetes<26.0.0,>=18.20.0
+Requires-Dist: ldap3
+Requires-Dist: manhole
+Requires-Dist: mypy-extensions>=0.3.0
+Requires-Dist: nats-py
+Requires-Dist: nulltype
+Requires-Dist: objgraph
+Requires-Dist: ply
+Requires-Dist: progressbar2>=4.3.2
+Requires-Dist: prometheus-client
+Requires-Dist: pymesos>=0.2.0
+Requires-Dist: pyramid-swagger>=2.3.0
+Requires-Dist: pyramid>=2.0.2
+Requires-Dist: pysensu-yelp>=0.3.4
+Requires-Dist: PyStaticConfiguration
+Requires-Dist: python-crontab>=2.1.1
+Requires-Dist: python-dateutil>=2.4.0
+Requires-Dist: python-iptables
+Requires-Dist: pytimeparse>=1.1.0
+Requires-Dist: pytz>=2014.10
+Requires-Dist: requests<2.32.0,>=2.18.4
+Requires-Dist: requests-cache>=0.4.10
+Requires-Dist: retry
+Requires-Dist: ruamel.yaml
+Requires-Dist: sensu-plugin
+Requires-Dist: service-configuration-lib>=3.3.5
+Requires-Dist: signalfx
+Requires-Dist: slackclient>=1.2.1
+Requires-Dist: sticht>=1.1.0
+Requires-Dist: syslogmp
+Requires-Dist: transitions
+Requires-Dist: typing-extensions
+Requires-Dist: tzlocal
+Requires-Dist: urllib3
+Requires-Dist: utaw>=0.2.0
+Requires-Dist: wsgicors
+Dynamic: author
+Dynamic: author-email
+Dynamic: license-file
+Dynamic: provides
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary