seto 2.2.4__tar.gz → 2.3.1__tar.gz

{seto-2.2.4 → seto-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seto
-Version: 2.2.4
+Version: 2.3.1
 Summary: A Docker Swarm Deployment Manager
 License: Apache 2.0
 Keywords: docker,swarm,manager

{seto-2.2.4 → seto-2.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "seto"
-version = "2.2.4"
+version = "2.3.1"
 description = "A Docker Swarm Deployment Manager"
 keywords = ["docker", "swarm", "manager"]
 authors = ["Sébastien Demanou <demsking@gmail.com>"]

{seto-2.2.4 → seto-2.3.1}/seto/commands/config.py

@@ -42,6 +42,7 @@ def resolve(
 
   compose = {
     'x-placement': None,
+    'x-placement-hostname': None,
     'configs': {},
     'networks': config_networks,
     'volumes': {},
@@ -50,6 +51,7 @@ def resolve(
   }
 
   def parse(resolved_compose_data: dict, volumes: list[Volume]):
+    placement_hostname = resolved_compose_data.get('x-placement-hostname', None)
     placement = resolved_compose_data.get('x-placement', None)
     networks_ = resolved_compose_data.get('networks', {})
     services = resolved_compose_data.get('services', {})
@@ -58,6 +60,7 @@ def resolve(
     secrets = resolved_compose_data.get('secrets', {})
 
     resolved_compose_data['networks'] = {**config_networks, **networks_}
+    compose['x-placement-hostname'] = placement_hostname
     compose['x-placement'] = placement
     compose['networks'].update(networks_)
     compose['services'].update(services)
@@ -65,8 +68,8 @@ def resolve(
     compose['configs'].update(configs)
     compose['secrets'].update(secrets)
 
-    if args.compose and not placement:
-      raise ValueError('Missing required x-placement field')
+    if args.compose and not placement and not placement_hostname:
+      raise ValueError('Missing required x-placement or x-placement-hostname field')
 
     if execute:
       execute(resolved_compose_data, placement)

{seto-2.2.4 → seto-2.3.1}/seto/commands/deploy.py

@@ -83,7 +83,7 @@ def parse_compose_config(
       service_deploy = {
         'placement': {
           'constraints': [
-            f'node.labels.{placement}',
+            f'node.labels.{placement}' if '=' in placement else f'node.hostname == {placement}',
           ],
         },
       }
@@ -105,7 +105,7 @@ def parse_compose_config(
       service_traefik_port = pick_label_value(service_labels, '.loadbalancer.server.port')
       service_traefik_entryPoints = pick_label_value(service_labels, '.entryPoints')
       service_traefik_tls_certresolver = pick_label_value(service_labels, '.tls.certresolver')
-      service_traefik_service = pick_label_value(service_labels, '.service')
+      service_traefik_service = pick_label_value(service_labels, '.service') or service_name
       published_port = random.randint(53100, 64200)
 
       if not service_traefik_port:
@@ -114,18 +114,18 @@ def parse_compose_config(
 
       service_ports.append(f'{published_port}:{service_traefik_port}')
 
-      traefik_http_provider_routers[service_name] = {
+      traefik_http_provider_routers[service_traefik_service] = {
         'entryPoints': [service_traefik_entryPoints],
-        'service': service_traefik_service or service_name,
+        'service': service_traefik_service,
         'rule': service_traefik_rule,
-        'middlewares': service_traefik_middlewares.split(','),
+        'middlewares': [item for item in service_traefik_middlewares.split(',') if item],
         'tls': {
           'certresolver': service_traefik_tls_certresolver,
         },
       }
 
       node_ip = resolve_hostname(compose.node_hostname)
-      traefik_http_provider_services[service_name] = {
+      traefik_http_provider_services[service_traefik_service] = {
         'loadBalancer': {
           'servers': [
             {
@@ -152,6 +152,7 @@ def deploy_seto_stack(args, driver: Driver, replica: list[Setting]) -> None:
   config_networks.update(GLOBAL_NETWORKS)
 
   print('Configuring seto-http-provider...')
+  traefik_http_provider_data_path = '/data'
   internal_stack = {
     'networks': config_networks,
     'services': {
@@ -161,10 +162,10 @@ def deploy_seto_stack(args, driver: Driver, replica: list[Setting]) -> None:
         'environment': [
           'WORKER=1',
           'EXPIRATION_MINUTES=10',
-          'PROVIDERS_DATABASE=/data/providers.db',
+          f'DATA_PATH={traefik_http_provider_data_path}',
         ],
         'volumes-nfs': {
-          'data:/data',
+          f'data:{traefik_http_provider_data_path}',
         },
         'deploy': {
           'mode': 'global',

{seto-2.2.4 → seto-2.3.1}/seto/core/docker.py

@@ -14,7 +14,6 @@
 # ==============================================================================
 import functools
 import json
-from typing import Any
 
 from docker import DockerClient
 
@@ -95,16 +94,24 @@ class Docker:
 
 class DockerCompose(Docker):
   @property
-  def placement(self) -> dict[str, Any]:
+  def placement_hostname(self) -> str | None:
+    return self.config['x-placement-hostname']
+
+  @property
+  def placement(self) -> str | None:
     return self.config['x-placement']
 
   @property
   @functools.lru_cache(maxsize=128)
   def node_hostname(self) -> str | None:
+    if self.placement_hostname:
+      return self.placement_hostname
+
     nodes = self.client.nodes.list()
 
     label_key, label_value = self.placement.split('==')
-    value = f'{label_value}'
+    label_key = f'{label_key}'.strip()
+    value = f'{label_value}'.strip()
 
     for node in nodes:
       if node.attrs['Spec']['Labels'].get(label_key) == value: