qontract-development-cli 0.17.1__tar.gz → 0.17.2__tar.gz

{qontract_development_cli-0.17.1 → qontract_development_cli-0.17.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-development-cli
-Version: 0.17.1
+Version: 0.17.2
 Summary: Helper tool for qontract-reconcile development
 Project-URL: homepage, http://github.com/chassing/qontract-development-cli
 Project-URL: repository, http://github.com/chassing/qontract-development-cli

{qontract_development_cli-0.17.1 → qontract_development_cli-0.17.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "qontract-development-cli"
-version = "0.17.1"
+version = "0.17.2"
 description = "Helper tool for qontract-reconcile development"
 authors = [{ name = "Christian Assing", email = "cassing@redhat.com" }]
 license = { text = "MIT" }

{qontract_development_cli-0.17.1 → qontract_development_cli-0.17.2}/qontract_development_cli/models.py

@@ -66,7 +66,7 @@ class ProfileSettings(BaseModel):
     qontract_api_worker_debugger_port: int = 5680
 
     # cache
-    cache_image: str = "redis:7-alpine"
+    cache_image: str = "valkey/valkey:8-alpine"
     cache_container_platform: str | None = None
     cache_compose_file: str = "cache.yml.j2"
 

{qontract_development_cli-0.17.1 → qontract_development_cli-0.17.2}/qontract_development_cli/shell.py

@@ -101,7 +101,8 @@ def compose_stop_project(project_name: str) -> None:
     for p in compose_list_projects():
         if p["Name"] == project_name:
             subprocess.run(
-                [*_docker_compose_bin, "-f", p["ConfigFiles"], "down"], check=True
+                [*_docker_compose_bin, "-f", p["ConfigFiles"].split(",")[0], "down"],
+                check=True,
             )
 
 

{qontract_development_cli-0.17.1 → qontract_development_cli-0.17.2}/qontract_development_cli/templates/cache.yml.j2

@@ -2,7 +2,6 @@ services:
   # Cache/Broker (Redis or Valkey compatible)
   cache:
     container_name: cache
-    platform: {{ profile.settings.cache_container_platform or env.settings.container_platform }}
     image: {{ profile.settings.cache_image }}
 
     ports:
@@ -10,12 +9,14 @@ services:
 
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
+      start_period: 5s
+      start_interval: 0.1s
       interval: 5s
       timeout: 3s
       retries: 5
 
     volumes:
-    - cache_data:/data
+    - cache_data_valkey:/data
 
 volumes:
-  cache_data:
+  cache_data_valkey:

{qontract_development_cli-0.17.1 → qontract_development_cli-0.17.2}/qontract_development_cli/templates/compose.override.yml.j2

@@ -17,12 +17,15 @@ services:
     depends_on:
       cache:
         condition: service_healthy
+
+    links:
+    - cache
     {% endif %}
 {% endif %}
 
 
-{% if env.settings.run_qontract_api_worker %}
-  qontract-api-worker:
+{% if env.settings.run_qontract_api_subscriber %}
+  qontract-api-subscriber:
     networks:
     - qontract-development
 
@@ -30,9 +33,23 @@ services:
     depends_on:
       cache:
         condition: service_healthy
+
+    links:
+    - cache
     {% endif %}
+{% endif %}
+
+
+{% if env.settings.run_qontract_api_worker %}
+  qontract-api-worker:
+    networks:
+    - qontract-development
 
     {% if env.settings.run_cache %}
+    depends_on:
+      cache:
+        condition: service_healthy
+
     links:
     - cache
     {% endif %}
@@ -62,21 +79,11 @@ services:
     - pki-volume:/etc/pki:z
     {% endif %}
 
-    {% if env.settings.run_qontract_api or env.settings.run_qontract_server or profile.settings.internal_redhat_ca %}
-    depends_on:
-    {% if env.settings.run_qontract_api %}
-      qontract-api:
-        condition: service_healthy
-    {% endif %}
-    {% if env.settings.run_qontract_server %}
-      qontract-server:
-        condition: service_healthy
-    {% endif %}
     {% if profile.settings.internal_redhat_ca %}
+    depends_on:
       internal-certificates:
         condition: service_completed_successfully # Let the init container create the pki directory first
     {% endif %}
-    {% endif %}
 
     {% if env.settings.run_qontract_server or env.settings.run_qontract_api or env.settings.run_vault %}
     links:

{qontract_development_cli-0.17.1 → qontract_development_cli-0.17.2}/qontract_development_cli/templates/internal-redhat-ca.yml.j2

@@ -1,6 +1,7 @@
 services:
   internal-certificates:
     image: {{ profile.settings.internal_redhat_ca_image }}
+    pull_policy: daily
     container_name: internal-certificates
     platform: {{ profile.settings.internal_redhat_ca_container_platform or env.settings.container_platform }}
     command: |

{qontract_development_cli-0.17.1 → qontract_development_cli-0.17.2}/qontract_development_cli/templates/vault.yml.j2

@@ -3,6 +3,7 @@ services:
     container_name: vault
     platform: {{ profile.settings.vault_container_platform or env.settings.container_platform }}
     image: {{ profile.settings.vault_image }}
+    pull_policy: daily
     environment:
     - VAULT_ADDR=http://127.0.0.1:8200
     - VAULT_TOKEN=root