paasta-tools 1.27.0__py3-none-any.whl → 1.35.8__py3-none-any.whl

paasta_tools/cli/utils.py

@@ -26,6 +26,7 @@ import socket
 import subprocess
 from collections import defaultdict
 from shlex import quote
+from typing import Any
 from typing import Callable
 from typing import Collection
 from typing import Generator
@@ -378,7 +379,7 @@ def list_service_instances(soa_dir: str = DEFAULT_SOA_DIR):
     return the_list
 
 
-def list_instances(**kwargs):
+def list_instances(**kwargs: Any) -> list[str]:
     """Returns a sorted list of all possible instance names
     for tab completion. We try to guess what service you might be
     operating on, otherwise we just provide *all* of them
@@ -576,7 +577,8 @@ def lazy_choices_completer(list_func):
 
 def figure_out_service_name(args, soa_dir=DEFAULT_SOA_DIR):
     """Figures out and validates the input service name"""
-    service = args.service or guess_service_name()
+    # most cmds should be doing this rstrip already - but just in case this is called from some other path...
+    service = args.service.rstrip("/") if args.service else guess_service_name()
     try:
         validate_service_name(service, soa_dir=soa_dir)
     except NoSuchService as service_not_found:
@@ -597,42 +599,54 @@ def get_jenkins_build_output_url():
 
 InstanceListerSig = Callable[
     [
-        NamedArg(str, "service"),
-        NamedArg(Optional[str], "cluster"),
-        NamedArg(str, "instance_type"),
-        NamedArg(str, "soa_dir"),
+        NamedArg(
+            str,
+            "service",  # noqa: F821  # flake8 false-positive, these are not var references
+        ),
+        NamedArg(Optional[str], "cluster"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "instance_type"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "soa_dir"),  # noqa: F821  # flake8 false-positive
     ],
     List[Tuple[str, str]],
 ]
 
 InstanceLoaderSig = Callable[
     [
-        NamedArg(str, "service"),
-        NamedArg(str, "instance"),
-        NamedArg(str, "cluster"),
-        NamedArg(bool, "load_deployments"),
-        NamedArg(str, "soa_dir"),
+        NamedArg(
+            str,
+            "service",  # noqa: F821  # flake8 false-positive, these are not var references
+        ),
+        NamedArg(str, "instance"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "cluster"),  # noqa: F821  # flake8 false-positive
+        NamedArg(bool, "load_deployments"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "soa_dir"),  # noqa: F821  # flake8 false-positive
     ],
     InstanceConfig,
 ]
 
 LongRunningServiceListerSig = Callable[
     [
-        NamedArg(str, "service"),
-        NamedArg(Optional[str], "cluster"),
-        NamedArg(str, "instance_type"),
-        NamedArg(str, "soa_dir"),
+        NamedArg(
+            str,
+            "service",  # noqa: F821  # flake8 false-positive, these are not var references
+        ),
+        NamedArg(Optional[str], "cluster"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "instance_type"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "soa_dir"),  # noqa: F821  # flake8 false-positive
     ],
     List[Tuple[str, str]],
 ]
 
 LongRunningServiceLoaderSig = Callable[
     [
-        NamedArg(str, "service"),
-        NamedArg(str, "instance"),
-        NamedArg(str, "cluster"),
-        NamedArg(bool, "load_deployments"),
-        NamedArg(str, "soa_dir"),
+        NamedArg(
+            str,
+            "service",  # noqa: F821  # flake8 false-positive, these are not var references
+        ),
+        NamedArg(str, "instance"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "cluster"),  # noqa: F821  # flake8 false-positive
+        NamedArg(bool, "load_deployments"),  # noqa: F821  # flake8 false-positive
+        NamedArg(str, "soa_dir"),  # noqa: F821  # flake8 false-positive
     ],
     LongRunningServiceConfig,
 ]

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/check_orphans.py

@@ -56,7 +56,7 @@ def get_zk_data(ignored_services: Set[str]) -> SmartstackData:
     zk = KazooClient(hosts=zk_hosts)
     zk.start()
 
-    logger.debug(f"pulling smartstack data from zookeeper")
+    logger.debug("pulling smartstack data from zookeeper")
     zk_data = {}
     services = zk.get_children(PREFIX)
     for service in services:

paasta_tools/contrib/get_running_task_allocation.py

@@ -1,5 +1,6 @@
 #!/opt/venvs/paasta-tools/bin/python
 import argparse
+import json
 import time
 from typing import Any
 from typing import Dict
@@ -12,7 +13,6 @@ from typing import Optional
 from typing import Tuple
 
 import a_sync
-import simplejson as json
 from kubernetes.client import V1Pod
 from kubernetes.client import V1ResourceRequirements
 

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/paasta_update_soa_memcpu.py

@@ -181,6 +181,9 @@ def get_report_from_splunk(creds, app, filename, criteria_filter):
             "date": d["result"]["_time"].split(" ")[0],
             "instance": criteria.split(" ")[2],
             "money": d["result"].get("estimated_monthly_savings", 0),
+            "old_cpus": d["result"].get("current_cpus"),
+            "old_disk": d["result"].get("current_disk"),
+            "old_mem": d["result"].get("current_mem"),
             "owner": d["result"].get("service_owner", "Unavailable"),
             "project": d["result"].get("project", "Unavailable"),
             "service": criteria.split(" ")[0],
@@ -192,24 +195,17 @@ def get_report_from_splunk(creds, app, filename, criteria_filter):
             "max_instances": d["result"].get("suggested_max_instances"),
             "mem": d["result"].get("suggested_mem"),
             "min_instances": d["result"].get("suggested_min_instances"),
-            "old_cpus": d["result"].get("current_cpus"),
-            "old_disk": d["result"].get("current_disk"),
-            "old_mem": d["result"].get("current_mem"),
         }
 
         # the report we get is all strings, so we need to convert them to the right types
         field_conversions = {
-            "current_cpus": float,
-            "suggested_cpu_burst_add": float,
-            "suggested_cpus": float,
-            "suggested_disk": int,
-            "suggested_hacheck_cpus": float,
-            "suggested_max_instances": int,
-            "suggested_mem": int,
-            "suggested_min_instances": int,
-            # not quite sure why these are floats...they're ints in soaconfigs
-            "current_disk": _force_str_to_int,
-            "current_mem": _force_str_to_int,
+            "cpus": float,
+            "cpu_burst_add": float,
+            "disk": int,
+            "hacheck_cpus": float,
+            "max_instances": int,
+            "mem": int,
+            "min_instances": int,
         }
 
         # merge results if we've already seen rows for this service

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/generate_deployments_for_service.py

@@ -101,6 +101,8 @@ def parse_args() -> argparse.Namespace:
         "--service",
         required=True,
         help="Service name to make the deployments.json for",
+        # strip any potential trailing / for folks tab-completing directories
+        type=lambda x: x.rstrip("/"),
     )
     args = parser.parse_args()
     return args

paasta_tools/instance/hpa_metrics_parser.py

@@ -1,8 +1,6 @@
 from typing import Optional
 
-from kubernetes.client.models.v2beta2_object_metric_status import (
-    V2beta2ObjectMetricStatus,
-)
+from kubernetes.client import V2ObjectMetricStatus
 from mypy_extensions import TypedDict
 
 
@@ -102,7 +100,7 @@ class HPAMetricsParser:
         )
 
     def parse_object_metric(
-        self, metric_spec: V2beta2ObjectMetricStatus, status: HPAMetricsDict
+        self, metric_spec: V2ObjectMetricStatus, status: HPAMetricsDict
     ) -> None:
         status["name"] = metric_spec.metric.name
         status["target_value"] = (
@@ -112,7 +110,7 @@ class HPAMetricsParser:
         )
 
     def parse_object_metric_current(
-        self, metric_spec: V2beta2ObjectMetricStatus, status: HPAMetricsDict
+        self, metric_spec: V2ObjectMetricStatus, status: HPAMetricsDict
     ) -> None:
         status["name"] = metric_spec.metric.name
         status["current_value"] = (

paasta_tools/instance/kubernetes.py

@@ -1,4 +1,6 @@
 import asyncio
+import logging
+from asyncio.tasks import Task
 from collections import defaultdict
 from enum import Enum
 from typing import Any
@@ -16,6 +18,7 @@ from typing import Union
 
 import a_sync
 import pytz
+import requests.exceptions
 from kubernetes.client import V1Container
 from kubernetes.client import V1ControllerRevision
 from kubernetes.client import V1Pod
@@ -74,6 +77,8 @@ INSTANCE_TYPE_CR_ID = dict(
     monkrelaycluster=monkrelaycluster_tools.cr_id,
 )
 
+logger = logging.getLogger(__name__)
+
 
 class ServiceMesh(Enum):
     SMARTSTACK = "smartstack"
@@ -99,6 +104,7 @@ class KubernetesVersionDict(TypedDict, total=False):
     config_sha: str
     pods: Sequence[Mapping[str, Any]]
     namespace: str
+    container_port: Optional[int]
 
 
 def cr_id(service: str, instance: str, instance_type: str) -> Mapping[str, str]:
@@ -346,31 +352,49 @@ async def mesh_status(
 
     pods = await pods_task
     for location, hosts in node_hostname_by_location.items():
-        host = replication_checker.get_hostname_in_pool(hosts, instance_pool)
-        if service_mesh == ServiceMesh.SMARTSTACK:
-            mesh_status["locations"].append(
-                _build_smartstack_location_dict(
-                    synapse_host=host,
-                    synapse_port=settings.system_paasta_config.get_synapse_port(),
-                    synapse_haproxy_url_format=settings.system_paasta_config.get_synapse_haproxy_url_format(),
-                    registration=registration,
-                    pods=pods,
-                    location=location,
-                    should_return_individual_backends=should_return_individual_backends,
-                )
-            )
-        elif service_mesh == ServiceMesh.ENVOY:
-            mesh_status["locations"].append(
-                _build_envoy_location_dict(
-                    envoy_host=host,
-                    envoy_admin_port=settings.system_paasta_config.get_envoy_admin_port(),
-                    envoy_admin_endpoint_format=settings.system_paasta_config.get_envoy_admin_endpoint_format(),
-                    registration=registration,
-                    pods=pods,
-                    location=location,
-                    should_return_individual_backends=should_return_individual_backends,
-                )
-            )
+        max_retries = 3
+
+        for attempt in range(max_retries):
+            host = replication_checker.get_hostname_in_pool(hosts, instance_pool)
+            try:
+                if service_mesh == ServiceMesh.SMARTSTACK:
+                    location_dict = _build_smartstack_location_dict(
+                        synapse_host=host,
+                        synapse_port=settings.system_paasta_config.get_synapse_port(),
+                        synapse_haproxy_url_format=settings.system_paasta_config.get_synapse_haproxy_url_format(),
+                        registration=registration,
+                        pods=pods,
+                        location=location,
+                        should_return_individual_backends=should_return_individual_backends,
+                    )
+                elif service_mesh == ServiceMesh.ENVOY:
+                    location_dict = _build_envoy_location_dict(
+                        envoy_host=host,
+                        envoy_admin_port=settings.system_paasta_config.get_envoy_admin_port(),
+                        envoy_admin_endpoint_format=settings.system_paasta_config.get_envoy_admin_endpoint_format(),
+                        registration=registration,
+                        pods=pods,
+                        location=location,
+                        should_return_individual_backends=should_return_individual_backends,
+                    )
+
+                mesh_status["locations"].append(location_dict)
+                return mesh_status
+
+            except requests.exceptions.ConnectTimeout:
+                if attempt < max_retries - 1:
+                    logger.warning(
+                        "attempt %s/%s: Unable to connect to %s, retrying (on another host, hopefully)...",
+                        attempt,
+                        max_retries,
+                        host,
+                    )
+                    continue
+                else:
+                    logger.critical(
+                        "Unable to connect to %s, not retrying again.", host
+                    )
+                    raise
     return mesh_status
 
 
@@ -641,7 +665,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 +677,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 +698,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 +709,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 +720,16 @@ 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
+                container_port=job_config.get_container_port(),
             )
         )
-        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 +740,11 @@ 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
+                container_port=job_config.get_container_port(),
             )
         )
-        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)
 
@@ -787,6 +813,7 @@ async def get_versions_for_replicasets(
     instance: str,
     namespaces: Iterable[str],
     pod_status_by_replicaset_task: "asyncio.Future[Mapping[str, Sequence[asyncio.Future[Dict[str, Any]]]]]",
+    container_port: Optional[int],
 ) -> List[KubernetesVersionDict]:
 
     replicaset_list: List[V1ReplicaSet] = []
@@ -814,6 +841,7 @@ async def get_versions_for_replicasets(
                 replicaset,
                 kube_client,
                 pod_status_by_replicaset.get(replicaset.metadata.name),
+                container_port,
             )
             for replicaset in actually_running_replicasets
         ]
@@ -825,6 +853,7 @@ async def get_replicaset_status(
     replicaset: V1ReplicaSet,
     client: kubernetes_tools.KubeClient,
     pod_status_tasks: Sequence["asyncio.Future[Dict[str, Any]]"],
+    container_port: Optional[int],
 ) -> KubernetesVersionDict:
     return {
         "name": replicaset.metadata.name,
@@ -839,6 +868,7 @@ async def get_replicaset_status(
         "config_sha": replicaset.metadata.labels.get("paasta.yelp.com/config_sha"),
         "pods": await asyncio.gather(*pod_status_tasks) if pod_status_tasks else [],
         "namespace": replicaset.metadata.namespace,
+        "container_port": container_port,
     }
 
 
@@ -1062,6 +1092,7 @@ async def get_versions_for_controller_revisions(
     instance: str,
     namespaces: Iterable[str],
     pod_status_by_sha_and_readiness_task: "asyncio.Future[Mapping[Tuple[str, str], Mapping[bool, Sequence[asyncio.Future[Mapping[str, Any]]]]]]",
+    container_port: Optional[int] = None,
 ) -> List[KubernetesVersionDict]:
     controller_revision_list: List[V1ControllerRevision] = []
 
@@ -1091,6 +1122,7 @@ async def get_versions_for_controller_revisions(
                 cr,
                 kube_client,
                 pod_status_by_sha_and_readiness[(git_sha, config_sha)],
+                container_port=container_port,
             )
             for (git_sha, config_sha), cr in cr_by_shas.items()
         ]
@@ -1105,6 +1137,7 @@ async def get_version_for_controller_revision(
     pod_status_tasks_by_readiness: Mapping[
         bool, Sequence["asyncio.Future[Mapping[str, Any]]"]
     ],
+    container_port: Optional[int] = None,
 ) -> KubernetesVersionDict:
     all_pod_status_tasks = [
         task for tasks in pod_status_tasks_by_readiness.values() for task in tasks
@@ -1121,6 +1154,7 @@ async def get_version_for_controller_revision(
         "config_sha": cr.metadata.labels.get("paasta.yelp.com/config_sha"),
         "pods": [task.result() for task in all_pod_status_tasks],
         "namespace": cr.metadata.namespace,
+        "container_port": container_port,
     }
 
 
@@ -1156,7 +1190,7 @@ async def kubernetes_status(
 
     # this task is necessary for mesh_status, but most other use cases want
     # just the list of pods
-    pods_task = asyncio.create_task(
+    pods_task: Task[Sequence[V1Pod]] = asyncio.create_task(
         kubernetes_tools.pods_for_service_instance(
             service=job_config.service,
             instance=job_config.instance,

paasta_tools/kubernetes/application/controller_wrappers.py

@@ -173,19 +173,31 @@ class Application(ABC):
         self, kube_client: KubeClient, namespace: str
     ) -> V1PodDisruptionBudget:
         max_unavailable: Union[str, int]
+
+        system_paasta_config = load_system_paasta_config()
+
         if "bounce_margin_factor" in self.soa_config.config_dict:
             max_unavailable = (
                 f"{int((1 - self.soa_config.get_bounce_margin_factor()) * 100)}%"
             )
         else:
-            system_paasta_config = load_system_paasta_config()
             max_unavailable = system_paasta_config.get_pdb_max_unavailable()
 
+        if "unhealthy_pod_eviction_policy" in self.soa_config.config_dict:
+            unhealthy_pod_eviction_policy = (
+                self.soa_config.get_unhealthy_pod_eviction_policy()
+            )
+        else:
+            unhealthy_pod_eviction_policy = (
+                system_paasta_config.get_unhealthy_pod_eviction_policy()
+            )
+
         pdr = pod_disruption_budget_for_service_instance(
             service=self.kube_deployment.service,
             instance=self.kube_deployment.instance,
             max_unavailable=max_unavailable,
             namespace=namespace,
+            unhealthy_pod_eviction_policy=unhealthy_pod_eviction_policy,
         )
         try:
             existing_pdr = kube_client.policy.read_namespaced_pod_disruption_budget(
@@ -198,12 +210,21 @@ class Application(ABC):
                 raise
 
         if existing_pdr:
+            """
+            Update the pod disruption budget only if spec.max_unavailable
+            or spec.unhealthy_pod_eviction_policy have changed;
+            ignore changes to other fields
+            """
             if existing_pdr.spec.min_available is not None:
                 logging.info(
                     "Not updating poddisruptionbudget: can't have both "
                     "min_available and max_unavailable"
                 )
-            elif existing_pdr.spec.max_unavailable != pdr.spec.max_unavailable:
+            elif (
+                existing_pdr.spec.max_unavailable != pdr.spec.max_unavailable
+                or existing_pdr.spec.unhealthy_pod_eviction_policy
+                != pdr.spec.unhealthy_pod_eviction_policy
+            ):
                 logging.info(f"Updating poddisruptionbudget {pdr.metadata.name}")
                 return kube_client.policy.patch_namespaced_pod_disruption_budget(
                     name=pdr.metadata.name, namespace=pdr.metadata.namespace, body=pdr