@brutalsystems/dray 0.1.10 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brutalsystems/dray",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Convention-driven multi-repo deploy orchestrator (forge for shipping)",
   "bin": {
     "dray": "bin/dray.js"

package/src/core/engine.js

@@ -52,9 +52,25 @@ async function execute(steps, { dryRun = false, allowDirty = false, deps } = {})
         const vars = {}; for (const s of u.stamp) vars[s.var] = `${s.repoUri}:${sha}`;
         const files = d.render.renderManifests(u.manifests, vars, u.repoPath, { dryRun });
         if (files[0]) renderDirs.push(path.dirname(files[0]));
+        // Read the running image BEFORE applying. If it differs from what we
+        // are about to stamp, this apply changes the pod template and the
+        // Deployment controller starts a rollout on its own — so the rollout
+        // step that follows must wait rather than restart, or every ship
+        // produces two ReplicaSets and replaces the pod twice.
+        //
+        // Deliberately conservative: any doubt (dry run, cronjob, unreadable
+        // deployment) leaves the restart in place, which is the previous
+        // behaviour.
+        u._applyStartsRollout = false;
+        if (!dryRun && u.workload && u.kind !== 'cronjob') {
+          try {
+            const before = await d.kubectl.runningImage({ workload: u.workload, kind: u.kind, context: u.defaults.context, namespace: u.defaults.namespace });
+            u._applyStartsRollout = before !== `${u.repoUri}:${sha}`;
+          } catch { u._applyStartsRollout = false; }
+        }
         for (const f of files) await d.kubectl.applyFile({ file: f, context: u.defaults.context, namespace: u.defaults.namespace, dryRun });
       } else if (step.kind === 'rollout') {
-        try { await d.kubectl.rollout({ deployment: u.workload, context: u.defaults.context, namespace: u.defaults.namespace, dryRun }); }
+        try { await d.kubectl.rollout({ deployment: u.workload, context: u.defaults.context, namespace: u.defaults.namespace, dryRun, restart: !u._applyStartsRollout }); }
         catch (err) { await d.kubectl.rolloutUndo({ deployment: u.workload, context: u.defaults.context, namespace: u.defaults.namespace, dryRun }); throw err; }
       }
     }

package/src/primitives/kubectl.js

@@ -1,8 +1,12 @@
 let _run = require('./exec').run; function _withRun(fn) { _run = fn; }
 const ns = (c, n) => ['-n', n, '--context', c];
 function applyFile({ file, context, namespace, dryRun }) { return _run('kubectl', ['apply', '-f', file, ...ns(context, namespace)], { dryRun }); }
-async function rollout({ deployment, context, namespace, dryRun }) {
-  await _run('kubectl', ['rollout', 'restart', `deployment/${deployment}`, ...ns(context, namespace)], { dryRun });
+// `restart: false` waits without restarting. Used when the preceding apply
+// stamped a new image SHA and therefore already started a rollout — issuing
+// `rollout restart` on top of that produces a SECOND ReplicaSet and a second
+// pod replacement, doubling the disruption window on every deploy.
+async function rollout({ deployment, context, namespace, dryRun, restart = true }) {
+  if (restart) await _run('kubectl', ['rollout', 'restart', `deployment/${deployment}`, ...ns(context, namespace)], { dryRun });
   return _run('kubectl', ['rollout', 'status', `deployment/${deployment}`, '--timeout=180s', ...ns(context, namespace)], { dryRun });
 }
 function rolloutUndo({ deployment, context, namespace, dryRun }) { return _run('kubectl', ['rollout', 'undo', `deployment/${deployment}`, ...ns(context, namespace)], { dryRun }); }