paasta-tools 1.4.12__tar.gz → 1.4.13__tar.gz

{paasta-tools-1.4.12/paasta_tools.egg-info → paasta-tools-1.4.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: paasta-tools
-Version: 1.4.12
+Version: 1.4.13
 Summary: Tools for Yelps SOA infrastructure
 Home-page: UNKNOWN
 Author: Compute Infrastructure @ Yelp

{paasta-tools-1.4.12 → paasta-tools-1.4.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.4.12"
+__version__ = "1.4.13"

{paasta-tools-1.4.12 → paasta-tools-1.4.13}/paasta_tools/check_autoscaler_max_instances.py

@@ -123,34 +123,42 @@ async def check_max_instances(
                         setpoint,
                     )
 
-                    metric_threshold_target_ratio = threshold / setpoint
                     try:
                         current_value = suffixed_number_value(metric["current_value"])
                         target_value = suffixed_number_value(metric["target_value"])
+                    except KeyError:
+                        # we likely couldn't find values for the current metric from autoscaling status
+                        # if this is the only metric, we will return UNKNOWN+this error
+                        # suggest fixing their autoscaling config
+                        output = f'{service}.{instance}: Service is at max_instances, and there is an error fetching your {metrics_provider_config["type"]} metric. Check your autoscaling configs or reach out to #paasta.'
+                    else:
+                        # target_value can be 100*setpoint (for cpu), 1 (for uwsgi, piscina, gunicorn,
+                        # active_requests), or setpoint (for promql).
+                        # Here we divide current_value by target_value to find the ratio of utilization to setpoint,
+                        # and then multiply by setpoint to find the actual utilization in the same units as setpoint.
+                        utilization = setpoint * current_value / target_value
+
+                        if threshold == setpoint:
+                            threshold_description = f"setpoint ({threshold})"
+                        else:
+                            threshold_description = (
+                                f"max_instances_alert_threshold ({threshold})"
+                            )
 
-                        if current_value / target_value > metric_threshold_target_ratio:
+                        if utilization > threshold:
                             status = pysensu_yelp.Status.CRITICAL
                             output = (
                                 f"{service}.{instance}: Service is at max_instances, and"
-                                " ratio of current value to target value"
-                                f" ({current_value} / {target_value}) is greater than the"
-                                " ratio of max_instances_alert_threshold to setpoint"
-                                f" ({threshold} / {setpoint})"
+                                f" utilization ({utilization}) is greater than"
+                                f" {threshold_description}."
                             )
                         else:
                             status = pysensu_yelp.Status.OK
                             output = (
                                 f"{service}.{instance}: Service is at max_instances, but"
-                                " ratio of current value to target value"
-                                f" ({current_value} / {target_value}) is below the ratio of"
-                                f" max_instances_alert_threshold to setpoint ({threshold} /"
-                                f" {setpoint})"
+                                f" utilization ({utilization}) is less than"
+                                f" {threshold_description}."
                             )
-                    except KeyError:
-                        # we likely couldn't find values for the current metric from autoscaling status
-                        # if this is the only metric, we will return UNKNOWN+this error
-                        # suggest fixing their autoscaling config
-                        output = f'{service}.{instance}: Service is at max_instances, and there is an error fetching your {metrics_provider_config["type"]} metric. Check your autoscaling configs or reach out to #paasta.'
             else:
                 status = pysensu_yelp.Status.OK
                 output = f"{service}.{instance} is below max_instances."

{paasta-tools-1.4.12 → paasta-tools-1.4.13}/paasta_tools/cli/schemas/eks_schema.json

@@ -928,6 +928,10 @@
                         "required": []
                     },
                     "uniqueItems": true
+                },
+                "uses_bulkdata": {
+                    "type": "boolean",
+                    "default": true
                 }
             }
         }

{paasta-tools-1.4.12 → paasta-tools-1.4.13}/paasta_tools/cli/schemas/kubernetes_schema.json

@@ -928,6 +928,10 @@
                         "required": []
                     },
                     "uniqueItems": true
+                },
+                "uses_bulkdata": {
+                    "type": "boolean",
+                    "default": true
                 }
             }
         }

{paasta-tools-1.4.12 → paasta-tools-1.4.13}/paasta_tools/kubernetes_tools.py

@@ -736,9 +736,9 @@ class KubernetesDeploymentConfig(LongRunningServiceConfig):
             instance=self.instance,
             cluster=self.cluster,
             config_dict=self.config_dict.copy(),
-            branch_dict=self.branch_dict.copy()
-            if self.branch_dict is not None
-            else None,
+            branch_dict=(
+                self.branch_dict.copy() if self.branch_dict is not None else None
+            ),
             soa_dir=self.soa_dir,
         )
 
@@ -1960,7 +1960,7 @@ class KubernetesDeploymentConfig(LongRunningServiceConfig):
             supported_storage_classes = (
                 system_paasta_config.get_supported_storage_classes()
             )
-        except (PaastaNotConfiguredError):
+        except PaastaNotConfiguredError:
             log.warning("No PaaSTA configuration was found, returning default value")
             supported_storage_classes = []
         storage_class_name = volume.get("storage_class_name", "ebs")
@@ -2144,6 +2144,7 @@ class KubernetesDeploymentConfig(LongRunningServiceConfig):
         docker_volumes = self.get_volumes(
             system_volumes=system_paasta_config.get_volumes()
         )
+
         hacheck_sidecar_volumes = system_paasta_config.get_hacheck_sidecar_volumes()
         has_routable_ip = self.has_routable_ip(
             service_namespace_config, system_paasta_config
@@ -2406,11 +2407,11 @@ class KubernetesDeploymentConfig(LongRunningServiceConfig):
             preferred_terms = None
 
         return V1NodeAffinity(
-            required_during_scheduling_ignored_during_execution=V1NodeSelector(
-                node_selector_terms=[required_term]
-            )
-            if required_term
-            else None,
+            required_during_scheduling_ignored_during_execution=(
+                V1NodeSelector(node_selector_terms=[required_term])
+                if required_term
+                else None
+            ),
             preferred_during_scheduling_ignored_during_execution=preferred_terms,
         )
 
@@ -2701,7 +2702,7 @@ def get_kubernetes_services_running_here_for_nerve(
                     }
                 nerve_dict["weight"] = kubernetes_service.weight
                 nerve_list.append((registration, nerve_dict))
-        except (KeyError):
+        except KeyError:
             continue  # SOA configs got deleted for this app, it'll get cleaned up
 
     return nerve_list
@@ -2872,10 +2873,12 @@ def list_deployments_in_all_namespaces(
             ),
             namespace=item.metadata.namespace,
             config_sha=item.metadata.labels.get("paasta.yelp.com/config_sha", ""),
-            replicas=item.spec.replicas
-            if item.metadata.labels.get(paasta_prefixed("autoscaled"), "false")
-            == "false"
-            else None,
+            replicas=(
+                item.spec.replicas
+                if item.metadata.labels.get(paasta_prefixed("autoscaled"), "false")
+                == "false"
+                else None
+            ),
         )
         for item in deployments.items + stateful_sets.items
     ]
@@ -2904,10 +2907,12 @@ def list_deployments(
             ),
             namespace=item.metadata.namespace,
             config_sha=item.metadata.labels["paasta.yelp.com/config_sha"],
-            replicas=item.spec.replicas
-            if item.metadata.labels.get(paasta_prefixed("autoscaled"), "false")
-            == "false"
-            else None,
+            replicas=(
+                item.spec.replicas
+                if item.metadata.labels.get(paasta_prefixed("autoscaled"), "false")
+                == "false"
+                else None
+            ),
         )
         for item in deployments.items + stateful_sets.items
     ]

{paasta-tools-1.4.12 → paasta-tools-1.4.13}/paasta_tools/utils.py

@@ -351,6 +351,7 @@ class InstanceConfigDict(TypedDict, total=False):
     iam_role: str
     iam_role_provider: str
     service: str
+    uses_bulkdata: bool
 
 
 class BranchDictV1(TypedDict, total=False):
@@ -997,8 +998,27 @@ class InstanceConfig:
         """
         return self.config_dict.get("net", "bridge")
 
+    def has_bulkdata(
+        self,
+    ) -> bool:
+        return self.config_dict.get("uses_bulkdata", True)
+
     def get_volumes(self, system_volumes: Sequence[DockerVolume]) -> List[DockerVolume]:
         volumes = list(system_volumes) + list(self.get_extra_volumes())
+        # we used to add bulkdata as a default mount - but as part of the
+        # effort to deprecate the entire system, we're swapping to an opt-in
+        # model so that we can shrink the blast radius of any changes
+        if self.has_bulkdata():
+            # bulkdata is mounted RO as the data is produced by another
+            # system and we want to ensure that there are no inadvertent
+            # changes by misbehaved code
+            volumes.append(
+                {
+                    "hostPath": "/nail/bulkdata",
+                    "containerPath": "/nail/bulkdata",
+                    "mode": "RO",
+                }
+            )
         return _reorder_docker_volumes(volumes)
 
     def get_persistent_volumes(self) -> Sequence[PersistentVolume]:

{paasta-tools-1.4.12 → paasta-tools-1.4.13/paasta_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: paasta-tools
-Version: 1.4.12
+Version: 1.4.13
 Summary: Tools for Yelps SOA infrastructure
 Home-page: UNKNOWN
 Author: Compute Infrastructure @ Yelp