From ae8e940521cf792d46e9c122454ec344a1bba245 Mon Sep 17 00:00:00 2001
From: Jared Trouth <jtrouth@burwood.com>
Date: Tue, 16 Feb 2021 09:19:01 -0600
Subject: [PATCH 1/3] Add wait flag to rollout command

---
 kubernetes/lookit/base/patches_/wait-init-gcloud-sqlproxy.yaml | 1 +
 kubernetes/lookit/base/patches_/wait-init-rabbitmq.yaml        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kubernetes/lookit/base/patches_/wait-init-gcloud-sqlproxy.yaml b/kubernetes/lookit/base/patches_/wait-init-gcloud-sqlproxy.yaml
index 3075f3f..9951114 100644
--- a/kubernetes/lookit/base/patches_/wait-init-gcloud-sqlproxy.yaml
+++ b/kubernetes/lookit/base/patches_/wait-init-gcloud-sqlproxy.yaml
@@ -7,5 +7,6 @@
       "rollout",
       "status",
       "deployment",
+      "-w",
       "$(GCLOUD_SQLPROXY_DEPLOYMENT_NAME)"
     ]
\ No newline at end of file
diff --git a/kubernetes/lookit/base/patches_/wait-init-rabbitmq.yaml b/kubernetes/lookit/base/patches_/wait-init-rabbitmq.yaml
index 56ccc8b..7632c4a 100644
--- a/kubernetes/lookit/base/patches_/wait-init-rabbitmq.yaml
+++ b/kubernetes/lookit/base/patches_/wait-init-rabbitmq.yaml
@@ -7,5 +7,6 @@
       "rollout",
       "status",
       "statefulset",
+      "-w",
       "$(RABBITMQ_STATEFULSET_NAME)"
     ]
\ No newline at end of file

From 589c1d5301fcb3d0a1877fc96cdcf533c67e4801 Mon Sep 17 00:00:00 2001
From: Jared Trouth <jtrouth@burwood.com>
Date: Tue, 16 Feb 2021 11:24:09 -0600
Subject: [PATCH 2/3] Add startup probe to sql proxy container

---
 .../lookit/base/patches_/add-cloud-sql-proxy-sidecar.yaml  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kubernetes/lookit/base/patches_/add-cloud-sql-proxy-sidecar.yaml b/kubernetes/lookit/base/patches_/add-cloud-sql-proxy-sidecar.yaml
index d3948f3..6133a28 100644
--- a/kubernetes/lookit/base/patches_/add-cloud-sql-proxy-sidecar.yaml
+++ b/kubernetes/lookit/base/patches_/add-cloud-sql-proxy-sidecar.yaml
@@ -12,4 +12,9 @@
     volumeMounts:
       - name: cloudsql-instance-credentials
         mountPath: /secrets/cloudsql
-        readOnly: true
\ No newline at end of file
+        readOnly: true
+    startupProbe:
+      tcpSocket:
+        port: 5432
+      initialDelaySeconds: 5
+      periodSeconds: 5
\ No newline at end of file

From b8f31fa9ce55abe91d7a30bcdd22d5e0845ae61c Mon Sep 17 00:00:00 2001
From: Jared Trouth <jtrouth@burwood.com>
Date: Tue, 16 Feb 2021 11:38:54 -0600
Subject: [PATCH 3/3] Add startup probe to rabbitmq container

---
 kubernetes/lookit/base/rabbitmq/statefulset.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kubernetes/lookit/base/rabbitmq/statefulset.yaml b/kubernetes/lookit/base/rabbitmq/statefulset.yaml
index d464c7b..e083b2a 100644
--- a/kubernetes/lookit/base/rabbitmq/statefulset.yaml
+++ b/kubernetes/lookit/base/rabbitmq/statefulset.yaml
@@ -95,6 +95,11 @@ spec:
           periodSeconds: 30
           failureThreshold: 3
           successThreshold: 1
+        startupProbe:
+          tcpSocket:
+            port: 5672
+          initialDelaySeconds: 5
+          periodSeconds: 5
         env:
           - name: BITNAMI_DEBUG
             value: "false"