djaploy 1.5.2__tar.gz → 1.5.4__tar.gz

{djaploy-1.5.2 → djaploy-1.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djaploy
-Version: 1.5.2
+Version: 1.5.4
 Summary: Modular Django deployment system based on pyinfra
 Author-email: Johanna Mae Dimayuga <johanna@techco.fi>
 License: MIT License

{djaploy-1.5.2 → djaploy-1.5.4}/djaploy/infra/charts/django-app/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: django-app
 description: A Django app the way djaploy ran it (gunicorn + nginx + SQLite/media on local disk), on k3s.
 type: application
-version: 0.2.2
+version: 0.2.4

{djaploy-1.5.2 → djaploy-1.5.4}/djaploy/infra/charts/django-app/templates/configmap.yaml

@@ -57,10 +57,37 @@ data:
     {{- if and (eq .Values.database.engine "sqlite") .Values.database.sqlite.snapshotBeforeMigrate }}
     python /scripts/snapshot.py {{ .Values.database.sqlite.keepSnapshots }}
     {{- end }}
+    {{- if .Values.django.settingsModule }}
+    python /scripts/rollout.py
+    {{- else }}
+    {{- /* no settings module: let manage.py pick its default, one process per command */}}
     python {{ .Values.django.managePy }} migrate --noinput
     {{- range .Values.migrations.extraCommands }}
     python {{ $.Values.django.managePy }} {{ . }}
     {{- end }}
+    {{- end }}
+  # migrate + extraCommands in one process: Django starts once (~1 s on the
+  # node) instead of once per command.
+  rollout.py: |
+    import os
+    import shlex
+    import sys
+
+    MANAGE_PY = {{ .Values.django.managePy | quote }}
+    EXTRA_COMMANDS = {{ toJson (.Values.migrations.extraCommands | default list) }}
+
+    # What `python manage.py` does: its folder goes first on the path.
+    sys.path.insert(0, os.path.dirname(os.path.abspath(MANAGE_PY)))
+
+    import django
+    from django.core.management import call_command
+
+    django.setup()
+    print("==> migrate", flush=True)
+    call_command("migrate", interactive=False, skip_checks=False)  # system checks, as manage.py migrate
+    for command in EXTRA_COMMANDS:
+        print(f"==> {command}", flush=True)
+        call_command(*shlex.split(command))
   snapshot.py: |
     """Consistent copy of the SQLite DB before migrating (the rollback point)."""
     import glob, os, sqlite3, sys, time

{djaploy-1.5.2 → djaploy-1.5.4}/djaploy/infra/charts/django-app/templates/deployment.yaml

@@ -1,5 +1,10 @@
 {{- $sqlite := eq .Values.database.engine "sqlite" -}}
 {{- $fullname := include "django-app.fullname" . -}}
+{{- $strategy := .Values.strategy | default (ternary "Recreate" "RollingUpdate" $sqlite) -}}
+{{- if not (has $strategy (list "Recreate" "RollingUpdate")) }}
+{{- fail (printf "strategy must be Recreate or RollingUpdate, not %q" $strategy) }}
+{{- end }}
+{{- $rolling := eq $strategy "RollingUpdate" -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -7,11 +12,17 @@ metadata:
   labels:
     {{- include "django-app.labels" . | nindent 4 }}
 spec:
-  # SQLite on a local disk + in-process background work: never two pods at once.
+  # SQLite: one pod (a rolling update briefly runs the new one beside it).
   replicas: {{ if .Values.suspended }}0{{ else if $sqlite }}1{{ else }}{{ .Values.replicas }}{{ end }}
   revisionHistoryLimit: 5
   strategy:
-    type: {{ if $sqlite }}Recreate{{ else }}RollingUpdate{{ end }}
+    type: {{ $strategy }}
+    {{- if $rolling }}
+    # Start the new pod, wait until it's ready, then stop the old one.
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+    {{- end }}
   selector:
     matchLabels:
       {{- include "django-app.selectorLabels" (dict "root" . "component" "web") | nindent 6 }}
@@ -61,6 +72,12 @@ spec:
           {{- include "django-app.containerEnv" . | nindent 10 }}
           ports:
             - { name: gunicorn, containerPort: 8000 }
+          {{- if $rolling }}
+          # Keep serving while Traefik stops routing to this pod.
+          lifecycle:
+            preStop:
+              exec: { command: ["sleep", "5"] }
+          {{- end }}
           # Host + X-Forwarded-Proto so ALLOWED_HOSTS and SECURE_SSL_REDIRECT accept the probe.
           startupProbe:
             {{- include "django-app.probe" . | nindent 12 }}
@@ -84,6 +101,12 @@ spec:
           image: {{ .Values.nginx.image }}
           ports:
             - { name: http, containerPort: 8080 }
+          {{- if $rolling }}
+          # Keep serving while Traefik stops routing to this pod.
+          lifecycle:
+            preStop:
+              exec: { command: ["sleep", "5"] }
+          {{- end }}
           readinessProbe:
             tcpSocket: { port: http }
             periodSeconds: {{ .Values.probes.readinessPeriodSeconds }}

{djaploy-1.5.2 → djaploy-1.5.4}/djaploy/infra/charts/django-app/values.yaml

@@ -57,6 +57,14 @@ migrations:
 # -- Ignored (always 1) while database.engine is sqlite.
 replicas: 1
 
+# -- Recreate (stop the old pod, then start the new one) or RollingUpdate (start
+# the new pod beside the old one, switch when it's ready: no downtime). Default:
+# Recreate for SQLite, RollingUpdate for Postgres. A SQLite app on RollingUpdate
+# briefly has two pods on the same database, and the new one migrates while the
+# old one still serves: its migrations must not break the running version, and
+# startup work mustn't redo what the old pod is still doing.
+strategy: ""
+
 storage:
   size: 10Gi
   storageClassName: local-path-retain

djaploy-1.5.4/djaploy/version.py

@@ -0,0 +1 @@
+__version__ = "1.5.4"

{djaploy-1.5.2 → djaploy-1.5.4}/djaploy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djaploy
-Version: 1.5.2
+Version: 1.5.4
 Summary: Modular Django deployment system based on pyinfra
 Author-email: Johanna Mae Dimayuga <johanna@techco.fi>
 License: MIT License

{djaploy-1.5.2 → djaploy-1.5.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "djaploy"
-version = "1.5.2"
+version = "1.5.4"
 description = "Modular Django deployment system based on pyinfra"
 authors = [
     {name = "Johanna Mae Dimayuga", email = "johanna@techco.fi"}

{djaploy-1.5.2 → djaploy-1.5.4}/tests/test_k3s.py

@@ -108,7 +108,7 @@ class ImageRefTests(unittest.TestCase):
 
 class ChartTests(unittest.TestCase):
     def test_bundled_chart_version(self):
-        self.assertEqual(k3s.chart_version(), "0.2.2")
+        self.assertEqual(k3s.chart_version(), "0.2.4")
 
 
 class BuildModeTests(unittest.TestCase):

djaploy-1.5.2/djaploy/version.py

@@ -1 +0,0 @@
-__version__ = "1.5.2"