paasta-tools 1.31.0__tar.gz → 1.31.2__tar.gz

{paasta_tools-1.31.0/paasta_tools.egg-info → paasta_tools-1.31.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: paasta-tools
-Version: 1.31.0
+Version: 1.31.2
 Summary: Tools for Yelps SOA infrastructure
 Author: Compute Infrastructure @ Yelp
 Author-email: compute-infra@yelp.com

{paasta_tools-1.31.0 → paasta_tools-1.31.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.31.0"
+__version__ = "1.31.2"

{paasta_tools-1.31.0 → paasta_tools-1.31.2}/paasta_tools/api/api_docs/swagger.json

@@ -1788,6 +1788,11 @@
         "KubernetesVersion": {
             "type": "object",
             "properties": {
+                "container_port": {
+                    "description": "Port the container is expecting to receive traffic on",
+                    "type": "integer",
+                    "format": "int32"
+                },
                 "type": {
                     "description": "Type of version (ReplicaSet or ControllerRevision)",
                     "type": "string"

{paasta_tools-1.31.0 → paasta_tools-1.31.2}/paasta_tools/cli/cmds/status.py

@@ -72,7 +72,6 @@ from paasta_tools.kubernetes_tools import format_tail_lines_for_kubernetes_pod
 from paasta_tools.kubernetes_tools import KubernetesDeploymentConfig
 from paasta_tools.kubernetes_tools import KubernetesDeployStatus
 from paasta_tools.kubernetes_tools import paasta_prefixed
-from paasta_tools.long_running_service_tools import DEFAULT_CONTAINER_PORT
 from paasta_tools.monitoring_tools import get_runbook
 from paasta_tools.monitoring_tools import get_team
 from paasta_tools.monitoring_tools import list_teams
@@ -1322,13 +1321,23 @@ def get_version_table_entry(
             if unhealthy_replicas:
                 entry.append("    Unhealthy Replicas:")
                 replica_table = create_replica_table(
-                    unhealthy_replicas, service, instance, cluster, verbose
+                    unhealthy_replicas,
+                    service,
+                    instance,
+                    cluster,
+                    version.container_port,
+                    verbose,
                 )
                 for line in replica_table:
                     entry.append(f"      {line}")
         else:
             replica_table = create_replica_table(
-                replica_states, service, instance, cluster, verbose
+                replica_states,
+                service,
+                instance,
+                cluster,
+                version.container_port,
+                verbose,
             )
             for line in replica_table:
                 entry.append(f"    {line}")
@@ -1403,12 +1412,6 @@ def get_main_container(pod: KubernetesPodV2) -> Optional[KubernetesContainerV2]:
     )
 
 
-def get_container_env(container: Optional[KubernetesContainerV2]) -> Dict[str, str]:
-    if not container or not container.env:
-        return {}
-    return {env_var.name: env_var.value for env_var in container.env}
-
-
 def get_replica_state(pod: KubernetesPodV2) -> ReplicaState:
     phase = pod.phase
     state = ReplicaState.UNKNOWN
@@ -1474,6 +1477,7 @@ def create_replica_table(
     service: str,
     instance: str,
     cluster: str,
+    container_port: int,
     verbose: int = 0,
 ) -> List[str]:
     header = ["ID", "IP/Port", "Host deployed to", "Started at what localtime", "State"]
@@ -1481,14 +1485,10 @@ def create_replica_table(
     for state, pod in pods:
         start_datetime = datetime.fromtimestamp(pod.create_timestamp)
         humanized_start_time = humanize.naturaltime(start_datetime)
-        # Get port from the main container's PAASTA_PORT env var, fallback to DEFAULT_CONTAINER_PORT
-        main_container = get_main_container(pod)
-        container_env = get_container_env(main_container)
-        paasta_port = container_env.get("PAASTA_PORT", str(DEFAULT_CONTAINER_PORT))
 
         row = [
             pod.name,
-            f"{pod.ip}:{paasta_port}" if pod.ip else "None",
+            f"{pod.ip}:{container_port}" if pod.ip else "None",
             pod.host or "None",
             humanized_start_time,
             state.formatted_message,
@@ -1503,6 +1503,7 @@ def create_replica_table(
                 )
             )
 
+        main_container = get_main_container(pod)
         if main_container:
             if main_container.timestamp:
                 timestamp = datetime.fromtimestamp(main_container.timestamp)

{paasta_tools-1.31.0 → paasta_tools-1.31.2}/paasta_tools/cli/cmds/validate.py

@@ -64,6 +64,7 @@ from paasta_tools.long_running_service_tools import METRICS_PROVIDER_PISCINA
 from paasta_tools.long_running_service_tools import METRICS_PROVIDER_PROMQL
 from paasta_tools.long_running_service_tools import METRICS_PROVIDER_UWSGI
 from paasta_tools.long_running_service_tools import METRICS_PROVIDER_UWSGI_V2
+from paasta_tools.long_running_service_tools import METRICS_PROVIDER_WORKER_LOAD
 from paasta_tools.secret_tools import get_secret_name_from_ref
 from paasta_tools.secret_tools import is_secret_ref
 from paasta_tools.secret_tools import is_shared_secret
@@ -163,6 +164,10 @@ INVALID_AUTOSCALING_FIELDS = {
         "desired_active_requests_per_replica",
         "prometheus-adapter-config",
     },
+    METRICS_PROVIDER_WORKER_LOAD: {
+        "desired_active_requests_per_replica",
+        "prometheus-adapter-config",
+    },
     METRICS_PROVIDER_PROMQL: {"desired_active_requests_per_replica"},
 }
 

{paasta_tools-1.31.0 → paasta_tools-1.31.2}/paasta_tools/instance/kubernetes.py

@@ -100,6 +100,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]:
@@ -698,6 +699,7 @@ async def kubernetes_status_v2(
                 instance=instance,
                 namespaces=relevant_namespaces,
                 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])  # type: ignore  # PAASTA-18698; ignoring due to unexpected type mismatch
@@ -717,6 +719,7 @@ async def kubernetes_status_v2(
                 instance=instance,
                 namespaces=relevant_namespaces,
                 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])  # type: ignore  # PAASTA-18698; ignoring due to unexpected type mismatch
@@ -788,6 +791,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] = []
@@ -815,6 +819,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
         ]
@@ -826,6 +831,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,
@@ -840,6 +846,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,
     }
 
 
@@ -1063,6 +1070,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] = []
 
@@ -1092,6 +1100,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()
         ]
@@ -1106,6 +1115,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
@@ -1122,6 +1132,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,
     }
 
 

{paasta_tools-1.31.0 → paasta_tools-1.31.2}/paasta_tools/paastaapi/model/kubernetes_version.py

@@ -81,6 +81,7 @@ class KubernetesVersion(ModelNormal):
         """
         lazy_import()
         return {
+            'container_port': (int,),  # noqa: E501
             'type': (str,),  # noqa: E501
             'create_timestamp': (float,),  # noqa: E501
             'git_sha': (str,),  # noqa: E501
@@ -99,6 +100,7 @@ class KubernetesVersion(ModelNormal):
 
 
     attribute_map = {
+        'container_port': 'container_port',  # noqa: E501
         'type': 'type',  # noqa: E501
         'create_timestamp': 'create_timestamp',  # noqa: E501
         'git_sha': 'git_sha',  # noqa: E501
@@ -157,6 +159,7 @@ class KubernetesVersion(ModelNormal):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
+            container_port (int): Port the container is expecting to receive traffic on. [optional]  # noqa: E501
             type (str): Type of version (ReplicaSet or ControllerRevision). [optional]  # noqa: E501
             create_timestamp (float): Unix timestamp when version was created. [optional]  # noqa: E501
             git_sha (str): Git SHA of service code for this version of the instance. [optional]  # noqa: E501

{paasta_tools-1.31.0 → paasta_tools-1.31.2/paasta_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: paasta-tools
-Version: 1.31.0
+Version: 1.31.2
 Summary: Tools for Yelps SOA infrastructure
 Author: Compute Infrastructure @ Yelp
 Author-email: compute-infra@yelp.com