paasta-tools 1.30.11__tar.gz → 1.30.13__tar.gz

{paasta_tools-1.30.11/paasta_tools.egg-info → paasta_tools-1.30.13}/PKG-INFO

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

{paasta_tools-1.30.11 → paasta_tools-1.30.13}/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.30.11"
+__version__ = "1.30.13"

{paasta_tools-1.30.11 → paasta_tools-1.30.13}/paasta_tools/cli/cmds/status.py

@@ -72,6 +72,7 @@ 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
@@ -1402,6 +1403,12 @@ 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,9 +1481,14 @@ 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}:8888" if pod.ip else "None",
+            f"{pod.ip}:{paasta_port}" if pod.ip else "None",
             pod.host or "None",
             humanized_start_time,
             state.formatted_message,
@@ -1491,7 +1503,6 @@ 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.30.11 → paasta_tools-1.30.13}/paasta_tools/kubernetes_tools.py

@@ -2455,11 +2455,11 @@ class KubernetesDeploymentConfig(LongRunningServiceConfig):
             # character limit for k8s labels (63 chars)
             labels["paasta.yelp.com/deploy_group"] = self.get_deploy_group()
 
-        elif self.should_use_metrics_provider(METRICS_PROVIDER_PISCINA):
+        if self.should_use_metrics_provider(METRICS_PROVIDER_PISCINA):
             labels["paasta.yelp.com/deploy_group"] = self.get_deploy_group()
             labels["paasta.yelp.com/scrape_piscina_prometheus"] = "true"
 
-        elif self.should_use_metrics_provider(METRICS_PROVIDER_GUNICORN):
+        if self.should_use_metrics_provider(METRICS_PROVIDER_GUNICORN):
             labels["paasta.yelp.com/deploy_group"] = self.get_deploy_group()
             labels["paasta.yelp.com/scrape_gunicorn_prometheus"] = "true"
 

{paasta_tools-1.30.11 → paasta_tools-1.30.13/paasta_tools.egg-info}/PKG-INFO

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

{paasta_tools-1.30.11 → paasta_tools-1.30.13}/tests/test_kubernetes_tools.py

@@ -1805,6 +1805,8 @@ class TestKubernetesDeploymentConfig:
         )
         mock_system_paasta_config.get_topology_spread_constraints.return_value = []
         mock_system_paasta_config.get_pod_defaults.return_value = dict(dns_policy="foo")
+        mock_load_system_paasta_config.return_value = mock_system_paasta_config
+        mock_system_paasta_config.get_service_auth_token_volume_config.return_value = {}
         mock_get_termination_grace_period.return_value = termination_grace_period
 
         if autoscaling_metric_provider:
@@ -1835,6 +1837,7 @@ class TestKubernetesDeploymentConfig:
         assert mock_service_namespace_config.is_in_smartstack.called
         assert mock_get_pod_volumes.called
         assert mock_get_volumes.called
+        assert mock_load_system_paasta_config.called
         pod_spec_kwargs = dict(
             service_account_name=None,
             containers=mock_get_kubernetes_containers.return_value,
@@ -1896,6 +1899,228 @@ class TestKubernetesDeploymentConfig:
 
         assert ret == expected
 
+    @mock.patch(
+        "paasta_tools.kubernetes_tools.load_system_paasta_config",
+        autospec=True,
+    )
+    @mock.patch(
+        "paasta_tools.kubernetes_tools.load_service_namespace_config", autospec=True
+    )
+    @mock.patch(
+        "paasta_tools.kubernetes_tools.KubernetesDeploymentConfig.get_kubernetes_containers",
+        autospec=True,
+    )
+    @mock.patch(
+        "paasta_tools.kubernetes_tools.KubernetesDeploymentConfig.get_volumes",
+        autospec=True,
+    )
+    @mock.patch(
+        "paasta_tools.kubernetes_tools.KubernetesDeploymentConfig.get_pod_volumes",
+        autospec=True,
+    )
+    @mock.patch(
+        "paasta_tools.kubernetes_tools.KubernetesDeploymentConfig.get_node_affinity",
+        autospec=True,
+    )
+    @mock.patch(
+        "paasta_tools.kubernetes_tools.KubernetesDeploymentConfig.get_termination_grace_period",
+        autospec=True,
+    )
+    @mock.patch(
+        "paasta_tools.kubernetes_tools.KubernetesDeploymentConfig.get_pod_anti_affinity",
+        autospec=True,
+    )
+    @mock.patch(
+        "paasta_tools.kubernetes_tools.create_pod_topology_spread_constraints",
+        autospec=True,
+    )
+    @pytest.mark.parametrize(
+        "metrics_providers,expected_labels",
+        [
+            # No metrics providers
+            ([], {}),
+            # Single providers
+            ([METRICS_PROVIDER_UWSGI], {}),
+            (
+                [METRICS_PROVIDER_PISCINA],
+                {"paasta.yelp.com/scrape_piscina_prometheus": "true"},
+            ),
+            (
+                [METRICS_PROVIDER_GUNICORN],
+                {"paasta.yelp.com/scrape_gunicorn_prometheus": "true"},
+            ),
+            ([METRICS_PROVIDER_CPU], {}),
+            ([METRICS_PROVIDER_UWSGI_V2], {}),
+            # Two provider combinations
+            (
+                [METRICS_PROVIDER_UWSGI, METRICS_PROVIDER_PISCINA],
+                {"paasta.yelp.com/scrape_piscina_prometheus": "true"},
+            ),
+            (
+                [METRICS_PROVIDER_UWSGI, METRICS_PROVIDER_GUNICORN],
+                {"paasta.yelp.com/scrape_gunicorn_prometheus": "true"},
+            ),
+            (
+                [METRICS_PROVIDER_PISCINA, METRICS_PROVIDER_GUNICORN],
+                {
+                    "paasta.yelp.com/scrape_piscina_prometheus": "true",
+                    "paasta.yelp.com/scrape_gunicorn_prometheus": "true",
+                },
+            ),
+            ([METRICS_PROVIDER_UWSGI, METRICS_PROVIDER_CPU], {}),
+            (
+                [METRICS_PROVIDER_PISCINA, METRICS_PROVIDER_CPU],
+                {"paasta.yelp.com/scrape_piscina_prometheus": "true"},
+            ),
+            (
+                [METRICS_PROVIDER_GUNICORN, METRICS_PROVIDER_CPU],
+                {"paasta.yelp.com/scrape_gunicorn_prometheus": "true"},
+            ),
+            # Three provider combinations
+            (
+                [
+                    METRICS_PROVIDER_UWSGI,
+                    METRICS_PROVIDER_PISCINA,
+                    METRICS_PROVIDER_GUNICORN,
+                ],
+                {
+                    "paasta.yelp.com/scrape_piscina_prometheus": "true",
+                    "paasta.yelp.com/scrape_gunicorn_prometheus": "true",
+                },
+            ),
+            (
+                [
+                    METRICS_PROVIDER_UWSGI,
+                    METRICS_PROVIDER_PISCINA,
+                    METRICS_PROVIDER_CPU,
+                ],
+                {"paasta.yelp.com/scrape_piscina_prometheus": "true"},
+            ),
+            (
+                [
+                    METRICS_PROVIDER_UWSGI,
+                    METRICS_PROVIDER_GUNICORN,
+                    METRICS_PROVIDER_CPU,
+                ],
+                {"paasta.yelp.com/scrape_gunicorn_prometheus": "true"},
+            ),
+            (
+                [
+                    METRICS_PROVIDER_PISCINA,
+                    METRICS_PROVIDER_GUNICORN,
+                    METRICS_PROVIDER_CPU,
+                ],
+                {
+                    "paasta.yelp.com/scrape_piscina_prometheus": "true",
+                    "paasta.yelp.com/scrape_gunicorn_prometheus": "true",
+                },
+            ),
+            # All providers
+            (
+                [
+                    METRICS_PROVIDER_UWSGI,
+                    METRICS_PROVIDER_PISCINA,
+                    METRICS_PROVIDER_GUNICORN,
+                    METRICS_PROVIDER_CPU,
+                ],
+                {
+                    "paasta.yelp.com/scrape_piscina_prometheus": "true",
+                    "paasta.yelp.com/scrape_gunicorn_prometheus": "true",
+                },
+            ),
+            (
+                [
+                    METRICS_PROVIDER_UWSGI,
+                    METRICS_PROVIDER_PISCINA,
+                    METRICS_PROVIDER_GUNICORN,
+                    METRICS_PROVIDER_CPU,
+                    METRICS_PROVIDER_UWSGI_V2,
+                ],
+                {
+                    "paasta.yelp.com/scrape_piscina_prometheus": "true",
+                    "paasta.yelp.com/scrape_gunicorn_prometheus": "true",
+                },
+            ),
+        ],
+    )
+    def test_get_pod_template_spec_multiple_metrics_providers(
+        self,
+        mock_create_pod_topology_spread_constraints,
+        mock_get_pod_anti_affinity,
+        mock_get_termination_grace_period,
+        mock_load_service_namespace_config,
+        mock_get_node_affinity,
+        mock_get_pod_volumes,
+        mock_get_kubernetes_containers,
+        mock_get_volumes,
+        mock_load_system_paasta_config,
+        metrics_providers: List[str],
+        expected_labels: Dict[str, str],
+    ):
+        """Test get_pod_template_spec with multiple metrics providers in all combinations."""
+        mock_service_namespace_config = mock.Mock()
+        mock_load_service_namespace_config.return_value = mock_service_namespace_config
+        mock_service_namespace_config.is_in_smartstack.return_value = True
+        mock_get_node_affinity.return_value = None
+        mock_get_pod_anti_affinity.return_value = None
+        mock_create_pod_topology_spread_constraints.return_value = []
+        mock_get_termination_grace_period.return_value = None
+
+        mock_system_paasta_config = mock.Mock()
+        mock_system_paasta_config.get_kubernetes_add_registration_labels.return_value = (
+            True
+        )
+        mock_system_paasta_config.get_topology_spread_constraints.return_value = []
+        mock_system_paasta_config.get_pod_defaults.return_value = {"dns_policy": "foo"}
+        mock_system_paasta_config.get_hacheck_sidecar_volumes.return_value = []
+        mock_load_system_paasta_config.return_value = mock_system_paasta_config
+        mock_system_paasta_config.get_service_auth_token_volume_config.return_value = {}
+
+        # Deployment config with multiple metrics providers
+        mock_config_dict = KubernetesDeploymentConfigDict(
+            min_instances=1,
+            max_instances=3,
+            autoscaling={
+                "metrics_providers": [
+                    {"type": provider} for provider in metrics_providers
+                ]
+            },
+            deploy_group="fake_group",
+        )
+        deployment = KubernetesDeploymentConfig(
+            service="kurupt",
+            instance="fm",
+            cluster="brentford",
+            config_dict=mock_config_dict,
+            branch_dict=None,
+        )
+
+        ret = deployment.get_pod_template_spec(
+            git_sha="aaaa123", system_paasta_config=mock_system_paasta_config
+        )
+
+        assert mock_load_system_paasta_config.called
+
+        # Each metric provider has its own set of labels. We expect to see all of them.
+        actual_labels = ret.metadata.labels
+        for expected_label, expected_value in expected_labels.items():
+            assert actual_labels.get(expected_label) == expected_value, (
+                f"Expected label {expected_label}={expected_value}, "
+                f"but got {actual_labels.get(expected_label)}"
+            )
+
+        # Deploy group label is only set when specific metrics providers are used
+        deploy_group_providers = {
+            METRICS_PROVIDER_UWSGI,
+            METRICS_PROVIDER_PISCINA,
+            METRICS_PROVIDER_GUNICORN,
+        }
+        if any(provider in deploy_group_providers for provider in metrics_providers):
+            assert actual_labels.get("paasta.yelp.com/deploy_group") == "fake_group"
+
+        # Autoscaled label is always set
+        assert actual_labels.get("paasta.yelp.com/autoscaled") == "true"
+
     @mock.patch(
         "paasta_tools.kubernetes_tools.KubernetesDeploymentConfig.get_prometheus_port",
         autospec=True,