From dfe6833ae66292dd3a47c7b6b3d9da8eeaf4d2fc Mon Sep 17 00:00:00 2001
From: npub122y0pqkertljmedu303rl0aqrj3w8pvu43t6jxm6875lzg6f2pwqegc3xc
 <5288f082d91aff2de5bc8be23fbfa01ca2e3859cac57a91b7a3fa9f12349505c@buzz.block.builderlab.xyz>
Date: Fri, 31 Jul 2026 21:09:52 -0700
Subject: [PATCH] fix(deploy): select local relay by component label

Label the relay Deployment metadata consistently with its pod template, and make the local Docker Desktop helper select exactly that Deployment and its pods rather than guessing among release resources.

Co-authored-by: npub122y0pqkertljmedu303rl0aqrj3w8pvu43t6jxm6875lzg6f2pwqegc3xc <5288f082d91aff2de5bc8be23fbfa01ca2e3859cac57a91b7a3fa9f12349505c@buzz.block.builderlab.xyz>
Signed-off-by: npub122y0pqkertljmedu303rl0aqrj3w8pvu43t6jxm6875lzg6f2pwqegc3xc <5288f082d91aff2de5bc8be23fbfa01ca2e3859cac57a91b7a3fa9f12349505c@buzz.block.builderlab.xyz>
---
 deploy/charts/buzz/templates/deployment.yaml |  1 +
 deploy/charts/buzz/tests/render_test.yaml    |  4 +++
 deploy/local/build-and-deploy.sh             | 27 ++++++++------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/deploy/charts/buzz/templates/deployment.yaml b/deploy/charts/buzz/templates/deployment.yaml
index 67a93138c..02d3e0c6e 100644
--- a/deploy/charts/buzz/templates/deployment.yaml
+++ b/deploy/charts/buzz/templates/deployment.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "buzz.fullname" . }}
   labels:
     {{- include "buzz.labels" . | nindent 4 }}
+    app.kubernetes.io/component: relay
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
diff --git a/deploy/charts/buzz/tests/render_test.yaml b/deploy/charts/buzz/tests/render_test.yaml
index cf0821078..bdba3c34f 100644
--- a/deploy/charts/buzz/tests/render_test.yaml
+++ b/deploy/charts/buzz/tests/render_test.yaml
@@ -22,6 +22,10 @@ tests:
           path: kind
           value: Deployment
         template: templates/deployment.yaml
+      - equal:
+          path: metadata.labels["app.kubernetes.io/component"]
+          value: relay
+        template: templates/deployment.yaml
       - equal:
           path: kind
           value: ServiceAccount
diff --git a/deploy/local/build-and-deploy.sh b/deploy/local/build-and-deploy.sh
index 4dce0fdc3..3c44e3d8f 100755
--- a/deploy/local/build-and-deploy.sh
+++ b/deploy/local/build-and-deploy.sh
@@ -103,17 +103,14 @@ if [ "$helm_rc" != 0 ]; then
 fi
 
 # ── 4. verify 3/3 Ready ───────────────────────────────────────────────────────
-# Find the relay Deployment: everything under this release named "buzz" except
-# the bundled "*-minio" Deployment. (The chart fullname collapses
-# "<release>-<chart>" to "<release>" when the release name already contains the
-# chart name, so the name isn't always "<release>-buzz".)
-DEPLOY=""
-for d in $(kubectl -n "$NS" get deploy -l "app.kubernetes.io/instance=$RELEASE" \
-             -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}'); do
-  case "$d" in *-minio) continue;; esac
-  DEPLOY="$d"; break
-done
-[ -n "$DEPLOY" ] || die "could not locate the relay Deployment"
+# Select the relay by its explicit component label. Optional worker/sidecar
+# Deployments share the release instance and must never become the rollout target.
+DEPLOYMENTS=$(kubectl -n "$NS" get deploy \
+  -l "app.kubernetes.io/instance=$RELEASE,app.kubernetes.io/component=relay" \
+  -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}')
+[ "$(printf '%s\n' "$DEPLOYMENTS" | sed '/^$/d' | wc -l | tr -d ' ')" = "1" ] || \
+  die "expected exactly one relay Deployment, got: ${DEPLOYMENTS:-<none>}"
+DEPLOY=$(printf '%s\n' "$DEPLOYMENTS" | sed '/^$/d')
 log "waiting for $REPLICAS relay pods Ready (deployment: $DEPLOY)"
 kubectl -n "$NS" rollout status deployment/"$DEPLOY" --timeout=4m | tee "$EVID/rollout.txt"
 kubectl -n "$NS" get pods -o wide | tee "$EVID/pods.txt"
@@ -123,15 +120,13 @@ READY=$(kubectl -n "$NS" get deploy "$DEPLOY" -o jsonpath='{.status.readyReplica
 log "deployment reports $READY/$REPLICAS Ready"
 
 # ── 5. probe /_readiness on EVERY relay pod (not just the deployment aggregate)
-# The bundled MinIO + init pods share app.kubernetes.io/name=buzz, so select by
-# the relay Deployment's own pod-template hash to hit only relay pods.
+# Select the relay pods by the same explicit component label as the Deployment.
 log "probing /_readiness on each relay pod individually"
 : > "$EVID/readiness.txt"
 FAIL=0
 RELAY_PODS=$(kubectl -n "$NS" get pods \
-  -l "app.kubernetes.io/name=buzz,app.kubernetes.io/instance=$RELEASE" \
-  -o jsonpath='{range .items[*]}{.metadata.name}{" "}{.metadata.labels.app\.kubernetes\.io/component}{"\n"}{end}' \
-  | awk '$2 != "minio" && $2 != "minio-init" {print $1}')
+  -l "app.kubernetes.io/instance=$RELEASE,app.kubernetes.io/component=relay" \
+  -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}')
 for pod in $RELAY_PODS; do
   body=$(kubectl -n "$NS" exec "$pod" -- \
     sh -c 'curl -sS --max-time 5 http://127.0.0.1:8080/_readiness' 2>/dev/null || echo '<curl-failed>')