paasta-tools 1.31.3__tar.gz → 1.32.0__tar.gz

{paasta_tools-1.31.3/paasta_tools.egg-info → paasta_tools-1.32.0}/PKG-INFO

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

{paasta_tools-1.31.3 → paasta_tools-1.32.0}/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.3"
+__version__ = "1.32.0"

{paasta_tools-1.31.3 → paasta_tools-1.32.0}/paasta_tools/cli/cmds/mark_for_deployment.py

@@ -1264,7 +1264,15 @@ class MarkForDeploymentProcess(RollbackSlackDeploymentProcess):
             self.ping_authors()
 
     def send_manual_rollback_instructions(self) -> None:
-        if self.deployment_version != self.old_deployment_version:
+        # NOTE: new deploy groups are not exactly a particularly frequent occurrence, but
+        # we want to prevent sending messages that look like
+        # `If you need to roll back manually, run: paasta rollback --service $S --deploy-group $G --commit None`
+        # since that's not actually valid/actionable.
+        # thus the seemingly out-of-nowhere old_git_sha check: new deploy groups won't have value set there.
+        if (
+            self.deployment_version != self.old_deployment_version
+            and self.old_git_sha is not None
+        ):
             extra_rollback_args = ""
             if self.old_deployment_version.image_version:
                 extra_rollback_args = (

{paasta_tools-1.31.3 → paasta_tools-1.32.0}/paasta_tools/kubernetes_tools.py

@@ -2424,6 +2424,10 @@ class KubernetesDeploymentConfig(LongRunningServiceConfig):
             "paasta.yelp.com/cluster": self.cluster,
             "yelp.com/owner": "compute_infra_platform_experience",
             "paasta.yelp.com/managed": "true",
+            # NOTE: this is mostly here for autoscaling purposes: we use information from the deploy group
+            # during Prometheus relabeling - but it's not a bad label to have around in general, thus its
+            # inclusion here
+            "paasta.yelp.com/deploy_group": self.get_deploy_group(),
         }
         if service_namespace_config.is_in_smartstack():
             labels["paasta.yelp.com/weight"] = str(self.get_weight())
@@ -2449,29 +2453,13 @@ class KubernetesDeploymentConfig(LongRunningServiceConfig):
 
         # not all services use autoscaling, so we label those that do in order to have
         # prometheus selectively discover/scrape them
-        metrics_providers_needing_deploy_group = [
-            METRICS_PROVIDER_UWSGI,
-            METRICS_PROVIDER_PISCINA,
-            METRICS_PROVIDER_GUNICORN,
-            METRICS_PROVIDER_WORKER_LOAD,
-        ]
-
-        if any(
-            self.should_use_metrics_provider(provider)
-            for provider in metrics_providers_needing_deploy_group
-        ):
-            # Deploy group is needed for Prometheus relabeling properly
-            # This should probably eventually be made into a default label,
-            # but for now we're fine with it being behind these feature toggles.
-            # Ideally, we'd also have the docker image here for ease-of-use
-            # in Prometheus relabeling, but that information is over the
-            # character limit for k8s labels (63 chars)
-            labels["paasta.yelp.com/deploy_group"] = self.get_deploy_group()
-
+        # NOTE: these are not mutually exclusive as a service could use multiple autoscaling types
         if self.should_use_metrics_provider(METRICS_PROVIDER_PISCINA):
             labels["paasta.yelp.com/scrape_piscina_prometheus"] = "true"
 
-        if self.should_use_metrics_provider(METRICS_PROVIDER_GUNICORN):
+        if self.should_use_metrics_provider(
+            METRICS_PROVIDER_GUNICORN
+        ) or self.should_use_metrics_provider(METRICS_PROVIDER_WORKER_LOAD):
             labels["paasta.yelp.com/scrape_gunicorn_prometheus"] = "true"
 
         # the default AWS LB Controller behavior is to enable this by-namespace

{paasta_tools-1.31.3 → paasta_tools-1.32.0/paasta_tools.egg-info}/PKG-INFO

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

{paasta_tools-1.31.3 → paasta_tools-1.32.0}/tests/test_kubernetes_tools.py

@@ -1818,7 +1818,7 @@ class TestKubernetesDeploymentConfig:
                 autoscaling={
                     "metrics_providers": [{"type": autoscaling_metric_provider}]
                 },
-                deploy_group="fake_group",
+                deploy_group="brentford.fm",
             )
             autoscaled_deployment = KubernetesDeploymentConfig(
                 service="kurupt",
@@ -1867,19 +1867,21 @@ class TestKubernetesDeploymentConfig:
             "registrations.paasta.yelp.com/kurupt.fm": "true",
             "yelp.com/owner": "compute_infra_platform_experience",
             "paasta.yelp.com/managed": "true",
+            "paasta.yelp.com/deploy_group": "brentford.fm",
         }
         if in_smtstk:
             expected_labels["paasta.yelp.com/weight"] = "10"
 
-        if autoscaling_metric_provider:
-            expected_labels["paasta.yelp.com/deploy_group"] = "fake_group"
-            if autoscaling_metric_provider in (
-                METRICS_PROVIDER_PISCINA,
-                METRICS_PROVIDER_GUNICORN,
-            ):
-                expected_labels[
-                    f"paasta.yelp.com/scrape_{autoscaling_metric_provider}_prometheus"
-                ] = "true"
+        if autoscaling_metric_provider in (
+            METRICS_PROVIDER_PISCINA,
+            METRICS_PROVIDER_GUNICORN,
+        ):
+            expected_labels[
+                f"paasta.yelp.com/scrape_{autoscaling_metric_provider}_prometheus"
+            ] = "true"
+        elif autoscaling_metric_provider == METRICS_PROVIDER_WORKER_LOAD:
+            expected_labels["paasta.yelp.com/scrape_gunicorn_prometheus"] = "true"
+
         if autoscaling_metric_provider in (
             METRICS_PROVIDER_UWSGI,
             METRICS_PROVIDER_GUNICORN,
@@ -4766,7 +4768,7 @@ def test_warning_big_bounce_default_config():
             job_config.format_kubernetes_app().spec.template.metadata.labels[
                 "paasta.yelp.com/config_sha"
             ]
-            == "config84789e0b"
+            == "config477c36f2"
         ), "If this fails, just change the constant in this test, but be aware that deploying this change will cause every service to bounce!"
 
 
@@ -4812,7 +4814,7 @@ def test_warning_big_bounce_routable_pod():
             job_config.format_kubernetes_app().spec.template.metadata.labels[
                 "paasta.yelp.com/config_sha"
             ]
-            == "config46a479f2"
+            == "config8f26372a"
         ), "If this fails, just change the constant in this test, but be aware that deploying this change will cause every smartstack-registered service to bounce!"
 
 
@@ -4859,7 +4861,7 @@ def test_warning_big_bounce_common_config():
             job_config.format_kubernetes_app().spec.template.metadata.labels[
                 "paasta.yelp.com/config_sha"
             ]
-            == "confige61d940f"
+            == "configcf829e28"
         ), "If this fails, just change the constant in this test, but be aware that deploying this change will cause every service to bounce!"