Merge pull request #178 from arms11/pods-wait-for-db-mq-availability

Introduced initContainers to wait for DB/MQ availability

Author: arm4b

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## 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

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 -}}

templates/deployments.yaml

@@ -41,8 +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:
+      {{ 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 }}
@@ -158,8 +160,10 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
-      {{- if .Values.st2.packs.image.repository }}
       initContainers:
+      {{ 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
       - name: st2-custom-packs
@@ -302,6 +306,9 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      {{ 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 }}"
@@ -487,6 +494,9 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      {{ 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 }}"
@@ -577,6 +587,9 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      {{ 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 }}"
@@ -659,6 +672,9 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      {{ 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 }}"
@@ -753,6 +769,9 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      {{ 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 }}"
@@ -847,6 +866,9 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      {{ 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 }}"
@@ -939,8 +961,10 @@ spec:
       {{- if $.Values.image.pullSecret }}
       - name: {{ $.Values.image.pullSecret }}
       {{- end }}
-      {{- if $.Values.st2.packs.image.repository }}
       initContainers:
+      {{ 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
       - name: st2-custom-packs
@@ -1108,8 +1132,10 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
-      {{- if .Values.st2.packs.image.repository }}
       initContainers:
+      {{ 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
       - name: st2-custom-packs
@@ -1259,6 +1285,9 @@ spec:
       {{- if .Values.image.pullSecret }}
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      initContainers:
+      {{ 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 }}"

templates/jobs.yaml

@@ -121,6 +121,16 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
+      {{ include "init-containers-wait-for-db" . | indent 6 }}
+      - 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 +233,7 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       initContainers:
+      {{ 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 }}"
@@ -338,6 +349,7 @@ spec:
       {{- end }}
       {{- if .Values.st2.packs.image.repository }}
       initContainers:
+      {{ 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