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

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.26.1"
+__version__ = "1.28.0"

paasta_tools/api/api_docs/swagger.json

@@ -322,8 +322,14 @@
                                 },
                                 "min_instances": {
                                     "type": "integer",
+                                    "x-nullable": true,
                                     "description": "Minimum number of instances to run"
                                 },
+                                "max_instances": {
+                                    "type": "integer",
+                                    "x-nullable": true,
+                                    "description": "Maximum number of instances to run"
+                                },
                                 "expire_after": {
                                     "type": "number",
                                     "format": "float",
@@ -1724,17 +1730,24 @@
             "properties": {
                 "min_instances": {
                     "type": "integer",
-                    "description": "Minimum number of instances to run",
-                    "minimum": 1
+                    "x-nullable": true,
+                    "description": "Minimum number of instances to run"
+                },
+                "max_instances": {
+                    "type": "integer",
+                    "x-nullable": true,
+                    "description": "Maximum number of instances to run"
                 },
                 "expire_after": {
                     "type": "number",
                     "format": "float",
-                    "description": "Unix timestamp when this override is no longer valid"
+                    "description": "Unix timestamp when this override is no longer valid",
+                    "minimum": 1
                 }
             },
             "required": [
                 "min_instances",
+                "max_instances",
                 "expire_after"
             ]
         },

paasta_tools/api/tweens/auth.py

@@ -77,7 +77,8 @@ class AuthTweenFactory:
         method: str,
         service: Optional[str],
     ) -> AuthorizationOutcome:
-        """Check if API request is authorized
+        """
+        Check if API request is authorized
 
         :param str path: API path
         :param str token: authentication token

paasta_tools/api/views/autoscaler.py

@@ -136,7 +136,7 @@ def set_autoscaling_override(request):
     Required parameters:
     - service: The service name
     - instance: The instance name
-    - min_instances: The minimum number of instances to enforce
+    - min_instances AND/OR max_instances: The minimum and/or maximum number of instances to enforce
     - expires_after: unix timestamp after which the override is no longer valid
     """
     service = request.swagger_data.get("service")
@@ -156,24 +156,29 @@ def set_autoscaling_override(request):
 
     json_body = request.swagger_data.get("json_body", {})
     min_instances_override = json_body.get("min_instances")
-    expire_after = json_body.get("expire_after")
+    max_instances_override = json_body.get("max_instances")
+    expire_after = json_body["expire_after"]
 
-    if not isinstance(min_instances_override, int) or min_instances_override < 1:
-        raise ApiFailure("min_instances must be a positive integer", 400)
+    # ideally we'd enforce this in our api spec - but since we're using both swagger and oapi, that's not quite so simple
+    if not min_instances_override and not max_instances_override:
+        raise ApiFailure(
+            "At least one of min_instances or max_instances must be provided", 400
+        )
 
-    if not expire_after:
-        raise ApiFailure("expire_after is required", 400)
+    # we can't currently enforce this in the API spec since the generator seems to have issues generating a validator
+    # for a nullable integer field with a minimum value as we get errors like:
+    # `TypeError: '<' not supported between instances of 'NoneType' and 'int'`
+    # that said, unless someone is manually crafting requests, this should never happen
+    # since the CLI includes a check for this as well
+    if min_instances_override is not None and min_instances_override < 1:
+        raise ApiFailure("min_instances must be a positive integer", 400)
+    if max_instances_override is not None and max_instances_override < 1:
+        raise ApiFailure("max_instances must be a positive integer", 400)
 
-    max_instances = instance_config.get_max_instances()
-    if max_instances is None:
+    # otherwise, we could have folks accidentally enable autoscaling (using cpu) for a non-autoscaled
+    if instance_config.is_autoscaling_enabled() is None:
         raise ApiFailure(f"Autoscaling is not enabled for {service}.{instance}", 400)
 
-    if max_instances < min_instances_override:
-        raise ApiFailure(
-            f"min_instances ({min_instances_override}) cannot be greater than max_instances ({max_instances})",
-            400,
-        )
-
     configmap, created = get_or_create_autoscaling_overrides_configmap()
     if created:
         log.info("Created new autoscaling overrides ConfigMap")
@@ -182,23 +187,54 @@ def set_autoscaling_override(request):
     if not configmap.data:
         configmap.data = {}
 
-    override_data = {
-        "min_instances": min_instances_override,
-        "created_at": datetime.now(timezone.utc).isoformat(),
-        # NOTE: we may want to also allow setting a max_instances override in the future, but if we do that
-        # we'd probably want to force folks to either set one or both and share the same expiration time
-        "expire_after": expire_after,
-    }
-
     service_instance = f"{service}.{instance}"
     existing_overrides = (
         json.loads(configmap.data[service_instance])
         if service_instance in configmap.data
         else {}
     )
-    merged_overrides = {**existing_overrides, **override_data}
+
+    # this is slightly funky as there's a hierarchy of what value to pick:
+    # 1. the override value provided in the request - as this should override any existing value
+    # 2. the existing override value in the configmap - this is used if we previously only set an override for min or
+    #    max instances and now want to set a value for the other
+    # 3. the value from the instance config - this is used as a final fallback since this means no override is present
+    min_instances = (
+        min_instances_override
+        or existing_overrides.get("min_instances")
+        or instance_config.get_min_instances()
+    )
+    max_instances = (
+        max_instances_override
+        or existing_overrides.get("max_instances")
+        or instance_config.get_max_instances()
+    )
+
+    # NOTE: the max_instances check is unnecessary here, but type-checkers can't see that the is_autoscaling_enabled()
+    # check above ensures that max_instances is not None
+    if max_instances is None or max_instances < min_instances:
+        raise ApiFailure(
+            f"min_instances ({min_instances_override}) cannot be greater than max_instances ({max_instances})",
+            400,
+        )
+
+    override_data = {
+        "min_instances": min_instances_override,
+        "max_instances": max_instances_override,
+        "created_at": datetime.now(timezone.utc).isoformat(),
+        "expire_after": expire_after,
+    }
+
+    # NOTE: we need to strip out null values from the incoming overrides since otherwise we'd remove existing overrides
+    # (since if only --set-min or --set-max is provided, the other will be sent as None)
+    merged_overrides = {
+        **existing_overrides,
+        **{k: v for k, v in override_data.items() if v is not None},
+    }
     serialized_overrides = json.dumps(merged_overrides)
 
+    # note: we can only append with patching - if we ever want to remove overrides outside of the cleanup cronjob,
+    # we would need to change this to use replace_namespaced_configmap
     patch_namespaced_configmap(
         name=AUTOSCALING_OVERRIDES_CONFIGMAP_NAME,
         namespace=AUTOSCALING_OVERRIDES_CONFIGMAP_NAMESPACE,
@@ -213,6 +249,7 @@ def set_autoscaling_override(request):
         "instance": instance,
         "cluster": cluster,
         "min_instances": min_instances_override,
+        "max_instances": max_instances_override,
         "expire_after": expire_after,
         "status": "SUCCESS",
     }

paasta_tools/cli/cmds/autoscale.py

@@ -75,10 +75,18 @@ def add_subparser(subparsers):
         else autoscale_parser.error("Minimum instances must be >= 1"),
         default=None,
     )
+    override_group.add_argument(
+        "--set-max",
+        help="Set the maximum number of replicas (must be >= 1). Requires --for parameter.",
+        type=lambda x: int(x)
+        if int(x) >= 1
+        else autoscale_parser.error("Maximum instances must be >= 1"),
+        default=None,
+    )
     override_group.add_argument(
         "--for",
         dest="duration",
-        help="Duration for the temporary override (e.g. '3h', '30m'). Required when using --set-min.",
+        help="Duration for the temporary override (e.g. '3h', '30m'). Required when using --set-min and/or --set-max.",
         default=None,
     )
 
@@ -113,22 +121,24 @@ def paasta_autoscale(args):
     log.setLevel(logging.DEBUG)
     service = figure_out_service_name(args)
 
-    if args.set_min is not None and not args.duration:
+    if (args.set_min is not None or args.set_max is not None) and not args.duration:
         print(
             PaastaColors.yellow(
-                "WARNING: --set-min requires --for parameter to specify duration - defaulting to 30m"
+                "WARNING: --set-min/--set-max usage requires --for parameter to specify duration - defaulting to 30m"
             )
         )
         args.duration = "30m"
 
-    if args.duration is not None and args.set_min is None:
-        print(PaastaColors.red("Error: --for requires --set-min parameter"))
+    if args.duration is not None and args.set_min is None and args.set_max is None:
+        print(
+            PaastaColors.red("Error: --for requires --set-min or --set-max parameter")
+        )
         return 1
 
-    if args.set is not None and args.set_min is not None:
+    if args.set is not None and args.set_min is not None and args.set_max is not None:
         print(
             PaastaColors.red(
-                "Error: Cannot use both --set and --set-min at the same time"
+                "Error: Cannot use both --set and --set-min or --set-max at the same time"
             )
         )
         return 1
@@ -159,9 +169,12 @@ def paasta_autoscale(args):
         print("Could not connect to paasta api. Maybe you misspelled the cluster?")
         return 1
 
+    # TODO: we should probably also make sure we set a couple other defaults - currently, it's possible for
+    # status/res/etc to be unbound in some code paths
+    err_reason = None
     try:
         # get current autoscaler count
-        if args.set is None and args.set_min is None:
+        if args.set is None and args.set_min is None and args.set_max is None:
             log.debug("Getting the current autoscaler count...")
             res, status, _ = api.autoscaler.get_autoscaler_count(
                 service=service, instance=args.instance, _return_http_data_only=False
@@ -187,7 +200,7 @@ def paasta_autoscale(args):
             )
 
         # set lower bound
-        elif args.set_min is not None:
+        elif args.set_min is not None or args.set_max is not None:
             duration_seconds = parse_duration_to_seconds(args.duration)
             if not duration_seconds:
                 print(
@@ -202,10 +215,11 @@ def paasta_autoscale(args):
             expiration_time = time.time() + duration_seconds
 
             log.debug(
-                f"Setting minimum instances to {args.set_min} for duration {args.duration}."
+                f"Sending the following overrides for duration {args.duration}: min_instances: {args.set_min}, max_instances: {args.set_max}."
             )
             msg = paastamodels.AutoscalingOverride(
                 min_instances=args.set_min,
+                max_instances=args.set_max,
                 expire_after=expiration_time,
             )
 
@@ -224,28 +238,35 @@ def paasta_autoscale(args):
             )
     except api.api_error as exc:
         status = exc.status
+        err_reason = exc.body
 
     if not 200 <= status <= 299:
         print(
             PaastaColors.red(
-                f"ERROR: '{args.instance}' is not configured to autoscale OR you set min_instances above the current max_instances, "
+                f"ERROR: '{args.instance}' is not configured to autoscale OR you set impossible {{min, max}}_instances, "
                 f"and `paasta autoscale` could not update it. "
                 f"If you want to be able to boost this service, please configure autoscaling for the service "
                 f"in its config file by setting min and max instances appropriately. Example: \n"
                 f"{args.instance}:\n"
                 f"     min_instances: 5\n"
-                f"     max_instances: 50"
+                f"     max_instances: 50\n"
+                f"{err_reason}"
             )
         )
         return 0
 
     log.debug(f"Res: {res} Http: {status}")
-    if not args.set_min:
+    if not args.set_min and not args.set_max:
         print(f"Desired instances: {res.desired_instances}")
-    elif args.set_min:
-        print(
-            f"Temporary override set for {args.service}.{args.instance} with minimum instances: {args.set_min}"
-        )
+    else:
+        if args.set_min:
+            print(
+                f"Temporary override set for {args.service}.{args.instance} with minimum instances: {args.set_min}"
+            )
+        if args.set_max:
+            print(
+                f"Temporary override set for {args.service}.{args.instance} with maximum instances: {args.set_max}"
+            )
         # folks using this might be in different timezones, so let's convert the expiration time to a few common ones
         # to make it extra clear when the override will expire
         epoch_time = datetime.fromtimestamp(res.expire_after)

paasta_tools/cli/cmds/local_run.py

@@ -977,12 +977,12 @@ def run_docker_container(
             # First try to write the file as a string
             # This is for text like config files
             with open(temp_secret_filename, "w") as f:
-                f.write(secret_content)
+                f.write(secret_content)  # type: ignore  # TODO: make this type-safe rather than rely on exceptions
         except TypeError:
             # If that fails, try to write it as bytes
             # This is for binary files like TLS keys
             with open(temp_secret_filename, "wb") as fb:
-                fb.write(secret_content)
+                fb.write(secret_content)  # type: ignore  # TODO: make this type-safe rather than rely on exceptions
 
         # Append this to the list of volumes passed to docker run
         volumes.append(f"{temp_secret_filename}:{container_mount_path}:ro")

paasta_tools/contrib/bounce_log_latency_parser.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.8
+#!/usr/bin/env python3.10
 import itertools
 import json
 import sys

paasta_tools/contrib/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/contrib/mock_patch_checker.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.8
+#!/usr/bin/env python3.10
 import ast
 import sys
 

paasta_tools/contrib/render_template.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.8
+#!/usr/bin/env python3.10
 import argparse
 import os
 import re

paasta_tools/contrib/shared_ip_check.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.8
+#!/usr/bin/env python3.10
 import sys
 from collections import defaultdict
 

paasta_tools/instance/kubernetes.py

@@ -641,7 +641,7 @@ async def kubernetes_status_v2(
                 kube_client, job_config, job_config.get_kubernetes_namespace()
             )
         )
-        tasks.append(autoscaling_task)
+        tasks.append(autoscaling_task)  # type: ignore  # PAASTA-18698; ignoring due to unexpected type mismatch
     else:
         autoscaling_task = None
 
@@ -653,7 +653,7 @@ async def kubernetes_status_v2(
             namespaces=relevant_namespaces,
         )
     )
-    tasks.append(pods_task)
+    tasks.append(pods_task)  # type: ignore  # PAASTA-18698; ignoring due to unexpected type mismatch
 
     service_namespace_config = kubernetes_tools.load_service_namespace_config(
         service=service,
@@ -674,9 +674,9 @@ async def kubernetes_status_v2(
             )
         )
         backends_task = asyncio.create_task(
-            get_backends_from_mesh_status(mesh_status_task)
+            get_backends_from_mesh_status(mesh_status_task)  # type: ignore  # PAASTA-18698; ignoring due to unexpected type mismatch
         )
-        tasks.extend([mesh_status_task, backends_task])
+        tasks.extend([mesh_status_task, backends_task])  # type: ignore  # PAASTA-18698; ignoring due to unexpected type mismatch
     else:
         mesh_status_task = None
         backends_task = None
@@ -685,7 +685,7 @@ async def kubernetes_status_v2(
         pod_status_by_sha_and_readiness_task = asyncio.create_task(
             get_pod_status_tasks_by_sha_and_readiness(
                 pods_task,
-                backends_task,
+                backends_task,  # type: ignore  # PAASTA-18698; ignoring due to unexpected type mismatch
                 kube_client,
                 verbose,
             )
@@ -696,15 +696,15 @@ async def kubernetes_status_v2(
                 service=service,
                 instance=instance,
                 namespaces=relevant_namespaces,
-                pod_status_by_sha_and_readiness_task=pod_status_by_sha_and_readiness_task,
+                pod_status_by_sha_and_readiness_task=pod_status_by_sha_and_readiness_task,  # type: ignore  # PAASTA-18698; ignoring due to unexpected type mismatch
             )
         )
-        tasks.extend([pod_status_by_sha_and_readiness_task, versions_task])
+        tasks.extend([pod_status_by_sha_and_readiness_task, versions_task])  # type: ignore  # PAASTA-18698; ignoring due to unexpected type mismatch
     else:
         pod_status_by_replicaset_task = asyncio.create_task(
             get_pod_status_tasks_by_replicaset(
                 pods_task,
-                backends_task,
+                backends_task,  # type: ignore  # PAASTA-18698; ignoring due to unexpected type mismatch
                 kube_client,
                 verbose,
             )
@@ -715,10 +715,10 @@ async def kubernetes_status_v2(
                 service=service,
                 instance=instance,
                 namespaces=relevant_namespaces,
-                pod_status_by_replicaset_task=pod_status_by_replicaset_task,
+                pod_status_by_replicaset_task=pod_status_by_replicaset_task,  # type: ignore  # PAASTA-18698; ignoring due to unexpected type mismatch
             )
         )
-        tasks.extend([pod_status_by_replicaset_task, versions_task])
+        tasks.extend([pod_status_by_replicaset_task, versions_task])  # type: ignore  # PAASTA-18698; ignoring due to unexpected type mismatch
 
     await asyncio.gather(*tasks, return_exceptions=True)
 

paasta_tools/kubernetes/application/controller_wrappers.py

@@ -301,7 +301,10 @@ class DeploymentWrapper(Application):
             kube_client=kube_client,
             namespace=self.item.metadata.namespace,
             min_instances_override=(
-                self.hpa_override["min_instances"] if self.hpa_override else None
+                self.hpa_override.get("min_instances") if self.hpa_override else None
+            ),
+            max_instances_override=(
+                self.hpa_override.get("max_instances") if self.hpa_override else None
             ),
         )
 

paasta_tools/kubernetes_tools.py

@@ -325,6 +325,7 @@ class DatastoreCredentialsConfig(TypedDict, total=False):
 
 class HpaOverride(TypedDict):
     min_instances: int
+    max_instances: int
     expire_after: str
 
 
@@ -899,6 +900,7 @@ class KubernetesDeploymentConfig(LongRunningServiceConfig):
         kube_client: KubeClient,
         namespace: str,
         min_instances_override: Optional[int] = None,
+        max_instances_override: Optional[int] = None,
     ) -> Optional[V2HorizontalPodAutoscaler]:
         # Returns None if an HPA should not be attached based on the config,
         # or the config is invalid.
@@ -914,7 +916,7 @@ class KubernetesDeploymentConfig(LongRunningServiceConfig):
             return None
 
         min_replicas = min_instances_override or self.get_min_instances()
-        max_replicas = self.get_max_instances()
+        max_replicas = max_instances_override or self.get_max_instances()
         if min_replicas == 0 or max_replicas == 0:
             log.error(
                 f"Invalid value for min or max_instances on {name}: {min_replicas}, {max_replicas}"
@@ -2015,7 +2017,7 @@ class KubernetesDeploymentConfig(LongRunningServiceConfig):
             )
             return None
 
-    def get_min_instances(self) -> Optional[int]:
+    def get_min_instances(self) -> int:
         return self.config_dict.get(
             "min_instances",
             1,
@@ -4690,7 +4692,9 @@ def get_namespaced_configmap(
 
 def patch_namespaced_configmap(
     name: str,
-    body: Dict[str, str],
+    # NOTE: passing a dict *seems* to work - but we should likely switch to passing a ConfigMap since that seems to be
+    # the most supported option
+    body: Union[V1ConfigMap, Dict[str, Any]],
     *,
     namespace: str,
     kube_client: KubeClient,

paasta_tools/mesos/master.py

@@ -147,7 +147,7 @@ class MesosMaster:
     def _file_resolver(self, cfg):
         return self.resolve(open(cfg[6:], "r+").read().strip())
 
-    @retry(KazooTimeoutError, tries=5, delay=0.5, logger=logger)
+    @retry(KazooTimeoutError, tries=5, delay=0.5, logger=logger)  # type: ignore
     def _zookeeper_resolver(self, cfg):
         hosts, path = cfg[5:].split("/", 1)
         path = "/" + path

paasta_tools/metrics/metastatus_lib.py

@@ -614,7 +614,7 @@ def group_slaves_by_key_func(
     """
     sorted_slaves: Sequence[_GenericNodeT]
     if sort_func is None:
-        sorted_slaves = sorted(slaves, key=key_func)
+        sorted_slaves = sorted(slaves, key=key_func)  # type: ignore # this code is to be deleted
     else:
         sorted_slaves = sort_func(slaves)