From 0cbb05c1de08c6bbceb2834d8af61ecf82c40ea2 Mon Sep 17 00:00:00 2001
From: Anand Patel <arms11@gmail.com>
Date: Wed, 10 Feb 2021 20:13:41 -0500
Subject: [PATCH 1/3] Introduced initContainers to wait for DB/MQ availability

---
 templates/deployments.yaml | 229 ++++++++++++++++++++++++++++++++++++-
 templates/jobs.yaml        |  36 ++++++
 2 files changed, 262 insertions(+), 3 deletions(-)

diff --git a/templates/deployments.yaml b/templates/deployments.yaml
index 386db37d..d5f4867a 100644
--- a/templates/deployments.yaml
+++ b/templates/deployments.yaml
@@ -43,6 +43,24 @@ spec:
       {{- end }}
       # Sidecar container for generating .htpasswd with st2 username & password pair and sharing produced file with the main st2auth container
       initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
+      - name: wait-for-queue
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
+              do sleep 2;
+            done
       - name: generate-htpasswd
         image: "{{ template "imageRepository" . }}/st2auth{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -158,8 +176,26 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
-      {{- if .Values.st2.packs.image.repository }}
       initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
+      - name: wait-for-queue
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
+              do sleep 2;
+            done
+      {{- if .Values.st2.packs.image.repository }}
       # Merge packs and virtualenvs from st2api with those from the st2.packs image
       # Custom packs
       - name: st2-custom-packs
@@ -302,6 +338,25 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
+      - name: wait-for-queue
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
+              do sleep 2;
+            done
       containers:
       - name: st2stream{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2stream{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -487,6 +542,25 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
+      - name: wait-for-queue
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
+              do sleep 2;
+            done
       containers:
       - name: st2rulesengine{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2rulesengine{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -577,6 +651,25 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
+      - name: wait-for-queue
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
+              do sleep 2;
+            done
       containers:
       - name: st2timersengine{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2timersengine{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -659,6 +752,25 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
+      - name: wait-for-queue
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
+              do sleep 2;
+            done
       containers:
       - name: st2workflowengine{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2workflowengine{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -753,6 +865,25 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
+      - name: wait-for-queue
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
+              do sleep 2;
+            done
       containers:
       - name: st2scheduler{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2scheduler{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -847,6 +978,25 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
+      - name: wait-for-queue
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
+              do sleep 2;
+            done
       containers:
       - name: st2notifier{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2notifier{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -939,8 +1089,26 @@ spec:
       {{- if $.Values.image.pullSecret }}
       - name: {{ $.Values.image.pullSecret }}
       {{- end }}
-      {{- if $.Values.st2.packs.image.repository }}
       initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ $.Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
+      - name: wait-for-queue
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ $.Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
+              do sleep 2;
+            done
+      {{- if $.Values.st2.packs.image.repository }}
       # Merge packs and virtualenvs from st2sensorcontainer with those from the st2.packs image
       # Custom packs
       - name: st2-custom-packs
@@ -1108,8 +1276,26 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
-      {{- if .Values.st2.packs.image.repository }}
       initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
+      - name: wait-for-queue
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
+              do sleep 2;
+            done
+      {{- if .Values.st2.packs.image.repository }}
       # Merge packs and virtualenvs from st2actionrunner with those from the st2.packs image
       # Custom packs
       - name: st2-custom-packs
@@ -1259,6 +1445,25 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
+      - name: wait-for-queue
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
+              do sleep 2;
+            done
       containers:
       - name: st2garbagecollector{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2garbagecollector{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -1349,6 +1554,24 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
+      - name: wait-for-queue
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
+              do sleep 2;
+            done
       {{- if .Values.st2.packs.image.repository }}
       # Merge packs and virtualenvs from st2actionrunner with those from the st2.packs image
       # Custom packs
diff --git a/templates/jobs.yaml b/templates/jobs.yaml
index c5e4e808..8ff49cd0 100644
--- a/templates/jobs.yaml
+++ b/templates/jobs.yaml
@@ -121,6 +121,24 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
+      - name: wait-for-api
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-st2api 9101 && echo st2api ready;
+              do sleep 2;
+            done
       # Sidecar container for generating st2client config with st2 username & password pair and sharing produced file with the main container
       - name: generate-st2client-config
         image: "{{ template "imageRepository" . }}/st2actionrunner{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -223,6 +241,15 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
       # Sidecar container for generating st2client config with st2 username & password pair and sharing produced file with the main container
       - name: generate-st2client-config
         image: "{{ template "imageRepository" . }}/st2actionrunner{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -338,6 +365,15 @@ spec:
       {{- end }}
       {{- if .Values.st2.packs.image.repository }}
       initContainers:
+      - name: wait-for-db
+        image: busybox:1.28
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
+              do sleep 2;
+            done
       # Merge packs and virtualenvs from st2actionrunner with those from the st2.packs image
       # Custom packs
       - name: st2-custom-packs

From 4752d8225478d14e5508300a7807eaf72a602ed8 Mon Sep 17 00:00:00 2001
From: Anand Patel <arms11@gmail.com>
Date: Fri, 12 Feb 2021 18:48:52 -0500
Subject: [PATCH 2/3] Defined template for resuability and made recommended
 changes

---
 CHANGELOG.md               |   3 +
 Chart.yaml                 |   2 +-
 templates/_helpers.tpl     |  33 +++++
 templates/deployments.yaml | 240 ++++---------------------------------
 templates/jobs.yaml        |  30 +----
 5 files changed, 63 insertions(+), 245 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b1e1af1..80b31605 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.52.0
+* Implemented initContainers to wait for DB/MQ to be available for St2 Pods (#178)
+
 ## In Development
 * Add option to define config.js for st2web (#165) (by @moonrail)
 
diff --git a/Chart.yaml b/Chart.yaml
index 292bce19..9b3321bb 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 # StackStorm version which refers to Docker images tag
 appVersion: 3.4dev
 name: stackstorm-ha
-version: 0.51.0
+version: 0.52.0
 description: StackStorm K8s Helm Chart, optimized for running StackStorm in HA environment.
 home: https://stackstorm.com/
 icon: https://landscape.cncf.io/logos/stack-storm.svg
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index afe94457..e9f084e2 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -94,3 +94,36 @@ Create the name of the stackstorm-ha service account to use
 {{- end -}}
 {{- end -}}
     
+{{- define "init-containers-wait-for-db" -}}
+{{- if index .Values "mongodb" "enabled" }}
+{{- $mongodb_port := (int (index .Values "mongodb" "service" "port")) }}
+- name: wait-for-db
+  image: busybox:1.28
+  command:
+    - 'sh'
+    - '-c'
+    - >
+      until nc -z -w 2 {{ $.Release.Name }}-mongodb-headless {{ $mongodb_port }} && echo mongodb ok;
+        do 
+          echo 'Waiting for MongoDB Connection...'
+          sleep 2;
+      done
+{{- end }}
+{{- end -}}
+
+{{- define "init-containers-wait-for-mq" -}}
+{{- if index .Values "rabbitmq" "enabled" }}
+{{- $rabbitmq_port := (int (index .Values "rabbitmq" "service" "port")) }}
+- name: wait-for-queue
+  image: busybox:1.28
+  command:
+    - 'sh'
+    - '-c'
+    - >
+      until nc -z -w 2 {{ $.Release.Name }}-rabbitmq {{ $rabbitmq_port }} && echo rabbitmq ok;
+        do
+          echo 'Waiting for RabbitMQ Connection...'
+          sleep 2;
+      done
+{{- end }}
+{{- end -}}
diff --git a/templates/deployments.yaml b/templates/deployments.yaml
index d5f4867a..37134b31 100644
--- a/templates/deployments.yaml
+++ b/templates/deployments.yaml
@@ -41,26 +41,10 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
-      # Sidecar container for generating .htpasswd with st2 username & password pair and sharing produced file with the main st2auth container
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
-      - name: wait-for-queue
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
+      {{ include "init-containers-wait-for-mq" . | indent 6 }}
+      # Sidecar container for generating .htpasswd with st2 username & password pair and sharing produced file with the main st2auth container
       - name: generate-htpasswd
         image: "{{ template "imageRepository" . }}/st2auth{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -177,24 +161,8 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
-      - name: wait-for-queue
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
+      {{ include "init-containers-wait-for-mq" . | indent 6 }}
       {{- if .Values.st2.packs.image.repository }}
       # Merge packs and virtualenvs from st2api with those from the st2.packs image
       # Custom packs
@@ -339,24 +307,8 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
-      - name: wait-for-queue
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
+      {{ include "init-containers-wait-for-mq" . | indent 6 }}
       containers:
       - name: st2stream{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2stream{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -543,24 +495,8 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
-      - name: wait-for-queue
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
+      {{ include "init-containers-wait-for-mq" . | indent 6 }}
       containers:
       - name: st2rulesengine{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2rulesengine{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -652,24 +588,8 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
-      - name: wait-for-queue
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
+      {{ include "init-containers-wait-for-mq" . | indent 6 }}
       containers:
       - name: st2timersengine{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2timersengine{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -753,24 +673,8 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
-      - name: wait-for-queue
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
+      {{ include "init-containers-wait-for-mq" . | indent 6 }}
       containers:
       - name: st2workflowengine{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2workflowengine{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -866,24 +770,8 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
-      - name: wait-for-queue
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
+      {{ include "init-containers-wait-for-mq" . | indent 6 }}
       containers:
       - name: st2scheduler{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2scheduler{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -979,24 +867,8 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
-      - name: wait-for-queue
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
+      {{ include "init-containers-wait-for-mq" . | indent 6 }}
       containers:
       - name: st2notifier{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2notifier{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -1090,24 +962,8 @@ spec:
       - name: {{ $.Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ $.Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
-      - name: wait-for-queue
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ $.Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" $ | indent 6 }}
+      {{ include "init-containers-wait-for-mq" $ | indent 6 }}
       {{- if $.Values.st2.packs.image.repository }}
       # Merge packs and virtualenvs from st2sensorcontainer with those from the st2.packs image
       # Custom packs
@@ -1277,24 +1133,8 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
-      - name: wait-for-queue
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
+      {{ include "init-containers-wait-for-mq" . | indent 6 }}
       {{- if .Values.st2.packs.image.repository }}
       # Merge packs and virtualenvs from st2actionrunner with those from the st2.packs image
       # Custom packs
@@ -1446,24 +1286,8 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
-      - name: wait-for-queue
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
+      {{ include "init-containers-wait-for-mq" . | indent 6 }}
       containers:
       - name: st2garbagecollector{{ template "enterpriseSuffix" . }}
         image: "{{ template "imageRepository" . }}/st2garbagecollector{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -1554,24 +1378,6 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
-      - name: wait-for-queue
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-rabbitmq 5672 && echo rabbitmq ok;
-              do sleep 2;
-            done
       {{- if .Values.st2.packs.image.repository }}
       # Merge packs and virtualenvs from st2actionrunner with those from the st2.packs image
       # Custom packs
diff --git a/templates/jobs.yaml b/templates/jobs.yaml
index 8ff49cd0..0cbff255 100644
--- a/templates/jobs.yaml
+++ b/templates/jobs.yaml
@@ -121,15 +121,7 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
       - name: wait-for-api
         image: busybox:1.28
         command:
@@ -241,15 +233,7 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
       # Sidecar container for generating st2client config with st2 username & password pair and sharing produced file with the main container
       - name: generate-st2client-config
         image: "{{ template "imageRepository" . }}/st2actionrunner{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
@@ -365,15 +349,7 @@ spec:
       {{- end }}
       {{- if .Values.st2.packs.image.repository }}
       initContainers:
-      - name: wait-for-db
-        image: busybox:1.28
-        command:
-          - 'sh'
-          - '-c'
-          - >
-            until nc -z -w 2 {{ .Release.Name }}-mongodb-headless 27017 && echo mongodb ok;
-              do sleep 2;
-            done
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
       # Merge packs and virtualenvs from st2actionrunner with those from the st2.packs image
       # Custom packs
       - name: st2-custom-packs

From 2d0862d46b34b5431075c9b133a14214e7de56ad Mon Sep 17 00:00:00 2001
From: armab <stackstorm@armab.io>
Date: Mon, 15 Feb 2021 20:04:43 +0000
Subject: [PATCH 3/3] Keep the feature under the 'In Development' section

---
 CHANGELOG.md | 4 +---
 Chart.yaml   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80b31605..fccdc318 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,7 @@
 # Changelog
 
-## v0.52.0
-* Implemented initContainers to wait for DB/MQ to be available for St2 Pods (#178)
-
 ## In Development
+* Implemented initContainers to wait for DB/MQ to be available for St2 Pods (#178)
 * Add option to define config.js for st2web (#165) (by @moonrail)
 
 ## v0.51.0
diff --git a/Chart.yaml b/Chart.yaml
index 9b3321bb..292bce19 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 # StackStorm version which refers to Docker images tag
 appVersion: 3.4dev
 name: stackstorm-ha
-version: 0.52.0
+version: 0.51.0
 description: StackStorm K8s Helm Chart, optimized for running StackStorm in HA environment.
 home: https://stackstorm.com/
 icon: https://landscape.cncf.io/logos/stack-storm.svg