include maintenance

Author: YuryHrytsuk

scripts/common.Makefile

@@ -246,16 +246,19 @@ clean-default: .check_clean ## Cleans all outputs
 	@.venv/bin/pip3 install jinja2 j2cli[yaml]
 
 
-# if j2cli_customization.py exists, include it
 # https://github.com/kolypto/j2cli?tab=readme-ov-file#customization
 ifeq ($(shell test -f j2cli_customization.py && echo -n yes),yes)
+
 define jinja
 	.venv/bin/j2 --format=env $(1) .env -o $(2) --customize j2cli_customization.py
 endef
+
 else
+
 define jinja
 	.venv/bin/j2 --format=env $(1) .env -o $(2)
 endef
+
 endif
 
 # Gracefully use defaults and potentially overwrite them, via https://stackoverflow.com/a/49804748

services/maintenance-page/docker-compose.yml.j2

@@ -28,7 +28,7 @@ services:
         - traefik.enable=true
         - traefik.docker.network=${PUBLIC_NETWORK}
         - traefik.http.routers.{{"maintenance_" + j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','') + "_html"}}.priority={{MAINTENANCE_PAGES_TRAEFIK_PRIORITY}}
-        - traefik.http.routers.{{"maintenance_" + j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','') + "_html"}}.rule=Host(`manual.{{j2item}}`) || (Host(`{{j2item}}`) && PathPrefix(`/`)) || (HostRegexp(`services.{{j2item}}`,`{subhost:[a-zA-Z0-9-]+}.services.{{j2item}}`) && PathPrefix(`/`))
+        - traefik.http.routers.{{"maintenance_" + j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','') + "_html"}}.rule=Host(`{{VENDOR_MANUAL_SUBDOMAIN_PREFIX}}.{{j2item}}`) || (Host(`{{j2item}}`) && PathPrefix(`/`)) || (HostRegexp(`services.{{j2item}}`,`{subhost:[a-zA-Z0-9-]+}.services.{{j2item}}`) && PathPrefix(`/`))
         - traefik.http.routers.{{"maintenance_" + j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','') + "_html"}}.tls=true
         - traefik.http.services.{{"maintenance_" + j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','') + "_html"}}.loadbalancer.server.port=80
         - traefik.http.routers.{{"maintenance_" + j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','') + "_html"}}.entrypoints=https

services/maintenance-page/template.env

@@ -8,3 +8,4 @@ PUBLIC_NETWORK=${PUBLIC_NETWORK}
 MONITORED_NETWORK=${MONITORED_NETWORK}
 REPO_CONFIG_LOCATION=${REPO_CONFIG_LOCATION}
 MAINTENANCE_PAGES_TRAEFIK_PRIORITY=${MAINTENANCE_PAGES_TRAEFIK_PRIORITY}
+VENDOR_MANUAL_SUBDOMAIN_PREFIX=${VENDOR_MANUAL_SUBDOMAIN_PREFIX}

services/vendors/docker-compose.yml.j2

@@ -30,7 +30,7 @@ services:
         - traefik.http.services.vendor_manual.loadbalancer.server.port=${VENDOR_MANUAL_PORT}
         - traefik.http.routers.vendor_manual.entrypoints=https
         - traefik.http.routers.vendor_manual.tls=true
-        - traefik.http.routers.vendor_manual.rule={{ generate_vendors_manual_traefik_rule(VENDOR_MANUAL_DOMAINS) }}
+        - traefik.http.routers.vendor_manual.rule={{ generate_vendors_manual_traefik_rule(VENDOR_MANUAL_PRODUCTS, VENDOR_MANUAL_SUBDOMAIN_PREFIX) }}
         - traefik.http.routers.vendor_manual.middlewares=ops_gzip@swarm, authenticated_platform_user@swarm
     networks:
       - public

services/vendors/j2cli_customization.py

@@ -1,11 +1,11 @@
-def _vendors_manual_traefik_rule(domains):
-    return " || ".join(
-        f"Host(`{domain.strip()}`)" for domain in domains.strip().strip(",").split(",")
-    )
+def _generate_vendors_manual_traefik_rule(domains: str, subdomain_prefix: str) -> str:
+    domain_list = domains.strip().strip(",").split(",")
+    domains = [f"{subdomain_prefix}.{domain}" for domain in domain_list]
+    return " || ".join(domains)
 
 
 def j2_environment(env):
     env.globals.update(
-        generate_vendors_manual_traefik_rule=_vendors_manual_traefik_rule
+        generate_vendors_manual_traefik_rule=_generate_vendors_manual_traefik_rule
     )
     return env

services/vendors/template.env

@@ -1,5 +1,6 @@
 VENDOR_MANUAL_IMAGE=${VENDOR_MANUAL_IMAGE}
 VENDOR_MANUAL_REPLICAS=${VENDOR_MANUAL_REPLICAS}
-VENDOR_MANUAL_DOMAINS=${VENDOR_MANUAL_DOMAINS}
+VENDOR_MANUAL_SUBDOMAIN_PREFIX=${VENDOR_MANUAL_SUBDOMAIN_PREFIX}
+VENDOR_MANUAL_PRODUCTS=${VENDOR_MANUAL_PRODUCTS}
 VENDOR_MANUAL_PORT=${VENDOR_MANUAL_PORT}
 PUBLIC_NETWORK=${PUBLIC_NETWORK}