assemblyline-core 4.7.2.dev17__tar.gz → 4.7.2.dev18__tar.gz

{assemblyline_core-4.7.2.dev17 → assemblyline_core-4.7.2.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.2.dev17
+Version: 4.7.2.dev18
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.7.2.dev18/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.7.2.dev18

{assemblyline_core-4.7.2.dev17 → assemblyline_core-4.7.2.dev18}/assemblyline_core/scaler/controllers/kubernetes_ctl.py

@@ -287,10 +287,9 @@ def parse_cpu(string: str) -> float:
 
 class KubernetesController(ControllerInterface):
     def __init__(self, logger, namespace: str, prefix: str, priority: str, dependency_priority: str,
-                 cpu_reservation: float, linux_node_selector: Selector, labels=None, log_level="INFO", core_env={},
-                 cluster_pod_list=True, enable_pod_security=False,
-                 default_service_tolerations=[],
-                 priv_labels=None):
+                 cpu_reservation: float, cpu_slack: float, linux_node_selector: Selector, labels=None,
+                 log_level="INFO", core_env={}, cluster_pod_list=True, enable_pod_security=False,
+                 default_service_tolerations=[], priv_labels=None):
         # Try loading a kubernetes connection from either the fact that we are running
         # inside of a cluster, or have a config file that tells us how
         try:
@@ -316,6 +315,7 @@ class KubernetesController(ControllerInterface):
         self.priority: str = priority
         self.dependency_priority: str = dependency_priority
         self.cpu_reservation: float = max(0.0, min(cpu_reservation, 1.0))
+        self.cpu_slack: float = max(1.0, cpu_slack + 1.0)
         self.logger = logger
         self.log_level: str = log_level
         self._labels: dict[str, str] = labels or {}
@@ -770,7 +770,7 @@ class KubernetesController(ControllerInterface):
             volume_mounts=mounts,
             security_context=security_context,
             resources=V1ResourceRequirements(
-                limits={'cpu': cores, 'memory': f'{memory}Mi'},
+                limits={'cpu': cores*self.cpu_slack, 'memory': f'{memory}Mi'},
                 requests={'cpu': cores*self.cpu_reservation, 'memory': f'{min_memory}Mi'},
             ),
             liveness_probe=health_probe,

{assemblyline_core-4.7.2.dev17 → assemblyline_core-4.7.2.dev18}/assemblyline_core/scaler/scaler_server.py

@@ -334,18 +334,20 @@ class ScalerServer(ThreadedCoreBase):
 
         if KUBERNETES_AL_CONFIG:
             self.log.info(f"Loading Kubernetes cluster interface on namespace: {NAMESPACE}")
-            self.controller = KubernetesController(logger=self.log, prefix='alsvc_', labels=labels,
-                                                   namespace=NAMESPACE, priority='al-service-priority',
-                                                   dependency_priority='al-core-priority',
-                                                   cpu_reservation=self.config.services.cpu_reservation,
-                                                   linux_node_selector=self.config.core.scaler.linux_node_selector,
-                                                   log_level=self.config.logging.log_level,
-                                                   core_env=core_env,
-                                                   cluster_pod_list=self.config.core.scaler.cluster_pod_list,
-                                                   enable_pod_security=self.config.core.scaler.enable_pod_security,
-                                                   default_service_tolerations=service_defaults_config.tolerations,
-                                                   priv_labels=priv_labels
-                                                   )
+            self.controller = KubernetesController(
+                logger=self.log, prefix='alsvc_', labels=labels,
+                namespace=NAMESPACE, priority='al-service-priority',
+                dependency_priority='al-core-priority',
+                cpu_reservation=self.config.services.cpu_reservation,
+                cpu_slack=self.config.services.cpu_slack,
+                linux_node_selector=self.config.core.scaler.linux_node_selector,
+                log_level=self.config.logging.log_level,
+                core_env=core_env,
+                cluster_pod_list=self.config.core.scaler.cluster_pod_list,
+                enable_pod_security=self.config.core.scaler.enable_pod_security,
+                default_service_tolerations=service_defaults_config.tolerations,
+                priv_labels=priv_labels
+            )
 
             # Add global configuration for privileged services
             # Check if the ConfigMap already exists, if it does, update it

{assemblyline_core-4.7.2.dev17 → assemblyline_core-4.7.2.dev18}/assemblyline_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.2.dev17
+Version: 4.7.2.dev18
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.7.2.dev17/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.7.2.dev17