assemblyline-core 4.5.1.dev307__tar.gz → 4.5.1.dev309__tar.gz

{assemblyline-core-4.5.1.dev307 → assemblyline-core-4.5.1.dev309}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-core
-Version: 4.5.1.dev307
+Version: 4.5.1.dev309
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline-core-4.5.1.dev309/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.5.1.dev309

{assemblyline-core-4.5.1.dev307 → assemblyline-core-4.5.1.dev309}/assemblyline_core/scaler/controllers/kubernetes_ctl.py

@@ -241,7 +241,8 @@ 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={},
-                 default_service_account=None, cluster_pod_list=True, default_service_tolerations = []):
+                 default_service_account=None, cluster_pod_list=True, 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:
@@ -270,6 +271,7 @@ class KubernetesController(ControllerInterface):
         self.logger = logger
         self.log_level: str = log_level
         self._labels: dict[str, str] = labels or {}
+        self._priv_labels: dict[str, str] = priv_labels or {}
         self.linux_node_selector = linux_node_selector
         self.apps_api = client.AppsV1Api()
         self.api = client.CoreV1Api()
@@ -800,7 +802,7 @@ class KubernetesController(ControllerInterface):
         all_labels['component'] = service_name
         if core_mounts:
             all_labels['privilege'] = 'core'
-            all_labels.update({k: v for k, v in (_l.split("=") for _l in self.config.core.scaler.privileged_services_additional_labels)})
+            all_labels.update(self._priv_labels)
         all_labels.update(labels or {})
 
         # Build set of volumes, first the global mounts, then the core specific ones,

{assemblyline-core-4.5.1.dev307 → assemblyline-core-4.5.1.dev309}/assemblyline_core/scaler/scaler_server.py

@@ -297,6 +297,7 @@ class ScalerServer(ThreadedCoreBase):
             'section': 'service',
             'privilege': 'service'
         }
+        priv_labels = {}
 
         service_defaults_config = self.config.core.scaler.service_defaults
 
@@ -309,6 +310,9 @@ class ScalerServer(ThreadedCoreBase):
         if self.config.core.scaler.additional_labels:
             labels.update({k: v for k, v in (_l.split("=") for _l in self.config.core.scaler.additional_labels)})
 
+        if self.config.core.scaler.privileged_services_additional_labels:
+            priv_labels.update({k: v for k, v in (_l.split("=") for _l in self.config.core.scaler.privileged_services_additional_labels)})
+
         if KUBERNETES_AL_CONFIG:
             self.log.info(f"Loading Kubernetes cluster interface on namespace: {NAMESPACE}")
             self.controller = KubernetesController(logger=self.log, prefix=SERVICE_PREFIX, labels=labels,
@@ -320,7 +324,8 @@ class ScalerServer(ThreadedCoreBase):
                                                    core_env=core_env,
                                                    cluster_pod_list=self.config.core.scaler.cluster_pod_list,
                                                    default_service_account=self.config.services.service_account,
-                                                   default_service_tolerations=service_defaults_config.tolerations
+                                                   default_service_tolerations=service_defaults_config.tolerations,
+                                                   priv_labels=priv_labels
                                                    )
 
             # Add global configuration for privileged services

{assemblyline-core-4.5.1.dev307 → assemblyline-core-4.5.1.dev309}/assemblyline_core/updater/run_updater.py

@@ -457,7 +457,10 @@ class ServiceUpdater(ThreadedCoreBase):
         if 'KUBERNETES_SERVICE_HOST' in os.environ and NAMESPACE:
             extra_labels = {}
             if self.config.core.scaler.additional_labels:
-                extra_labels = {k: v for k, v in (_l.split("=") for _l in self.config.core.scaler.additional_labels)}
+                extra_labels.update({k: v for k, v in (_l.split("=") for _l in self.config.core.scaler.additional_labels)})
+
+            if self.config.core.scaler.privileged_services_additional_labels:
+                extra_labels.update({k: v for k, v in (_l.split("=") for _l in self.config.core.scaler.privileged_services_additional_labels)})
 
             # If Updater has envs that set the service-server to use HTTPS, then assume a Root CA needs to be mounted
             if SERVICE_API_HOST and SERVICE_API_HOST.startswith('https'):

{assemblyline-core-4.5.1.dev307 → assemblyline-core-4.5.1.dev309}/assemblyline_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-core
-Version: 4.5.1.dev307
+Version: 4.5.1.dev309
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline-core-4.5.1.dev307/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.5.1.dev307