From d26b9aa33cf1e6a16d32d6bb4005141355e936d0 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Thu, 9 Apr 2026 18:16:26 -0500
Subject: [PATCH 1/2] fix: local overlay waits for clickhouse and postgres

---
 .../local/backend-startup-dependencies.yaml   | 23 +++++++++++++++++++
 .../local/dealbot-worker-deployment.yaml      | 16 +++++++++++++
 kustomize/overlays/local/kustomization.yaml   |  1 +
 3 files changed, 40 insertions(+)
 create mode 100644 kustomize/overlays/local/backend-startup-dependencies.yaml

diff --git a/kustomize/overlays/local/backend-startup-dependencies.yaml b/kustomize/overlays/local/backend-startup-dependencies.yaml
new file mode 100644
index 00000000..eb8d134e
--- /dev/null
+++ b/kustomize/overlays/local/backend-startup-dependencies.yaml
@@ -0,0 +1,23 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dealbot
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: wait-for-dependencies
+          image: busybox:1.36
+          command:
+            - sh
+            - -c
+            - |
+              set -eu
+              until nc -z dealbot-postgres 5432; do
+                echo "waiting for Postgres"
+                sleep 2
+              done
+              until wget -qO- http://dealbot-clickhouse:8123/ping | grep -qx "Ok."; do
+                echo "waiting for ClickHouse"
+                sleep 2
+              done
diff --git a/kustomize/overlays/local/dealbot-worker-deployment.yaml b/kustomize/overlays/local/dealbot-worker-deployment.yaml
index 449f28b4..f714485d 100644
--- a/kustomize/overlays/local/dealbot-worker-deployment.yaml
+++ b/kustomize/overlays/local/dealbot-worker-deployment.yaml
@@ -14,6 +14,22 @@ spec:
       labels:
         app.kubernetes.io/name: dealbot-worker
     spec:
+      initContainers:
+        - name: wait-for-dependencies
+          image: busybox:1.36
+          command:
+            - sh
+            - -c
+            - |
+              set -eu
+              until nc -z dealbot-postgres 5432; do
+                echo "waiting for Postgres"
+                sleep 2
+              done
+              until wget -qO- http://dealbot-clickhouse:8123/ping | grep -qx "Ok."; do
+                echo "waiting for ClickHouse"
+                sleep 2
+              done
       containers:
         - name: dealbot-worker
           image: dealbot:latest
diff --git a/kustomize/overlays/local/kustomization.yaml b/kustomize/overlays/local/kustomization.yaml
index 1a413626..8b7db459 100644
--- a/kustomize/overlays/local/kustomization.yaml
+++ b/kustomize/overlays/local/kustomization.yaml
@@ -16,6 +16,7 @@ patches:
   - path: web-service-nodeport.yaml
   - path: backend-configmap-local.yaml
   - path: backend-resources-local.yaml
+  - path: backend-startup-dependencies.yaml
   - path: web-env-local.yaml
 
 # Override images to use local tags

From 1a4a763a32a5e07b0ed07480cca11463c2748d9d Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 28 Apr 2026 08:40:54 -0400
Subject: [PATCH 2/2] fix: tighten clickhouse readiness check in local init
 containers

- grep -qxF treats "Ok." as fixed string so regex `.` no longer matches any char
- wget -T 5 prevents indefinite hang on slow or stuck endpoint
---
 kustomize/overlays/local/backend-startup-dependencies.yaml | 2 +-
 kustomize/overlays/local/dealbot-worker-deployment.yaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kustomize/overlays/local/backend-startup-dependencies.yaml b/kustomize/overlays/local/backend-startup-dependencies.yaml
index eb8d134e..c21cb7e4 100644
--- a/kustomize/overlays/local/backend-startup-dependencies.yaml
+++ b/kustomize/overlays/local/backend-startup-dependencies.yaml
@@ -17,7 +17,7 @@ spec:
                 echo "waiting for Postgres"
                 sleep 2
               done
-              until wget -qO- http://dealbot-clickhouse:8123/ping | grep -qx "Ok."; do
+              until wget -T 5 -qO- http://dealbot-clickhouse:8123/ping | grep -qxF "Ok."; do
                 echo "waiting for ClickHouse"
                 sleep 2
               done
diff --git a/kustomize/overlays/local/dealbot-worker-deployment.yaml b/kustomize/overlays/local/dealbot-worker-deployment.yaml
index f714485d..f0c1b3be 100644
--- a/kustomize/overlays/local/dealbot-worker-deployment.yaml
+++ b/kustomize/overlays/local/dealbot-worker-deployment.yaml
@@ -26,7 +26,7 @@ spec:
                 echo "waiting for Postgres"
                 sleep 2
               done
-              until wget -qO- http://dealbot-clickhouse:8123/ping | grep -qx "Ok."; do
+              until wget -T 5 -qO- http://dealbot-clickhouse:8123/ping | grep -qxF "Ok."; do
                 echo "waiting for ClickHouse"
                 sleep 2
               done