Merge pull request #15 from jtrouth/master

Add wait flag to rollout command
lookit · Feb 19, 2021 · 472ad33 · 472ad33
2 parents 12525db + b8f31fa
commit 472ad33
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 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
@@ -12,4 +12,9 @@
     volumeMounts:
       - name: cloudsql-instance-credentials
         mountPath: /secrets/cloudsql
-        readOnly: true
+        readOnly: true
+    startupProbe:
+      tcpSocket:
+        port: 5432
+      initialDelaySeconds: 5
+      periodSeconds: 5
diff --git 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)"
     ]
diff --git 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)"
     ]
diff --git 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"