Merge pull request #87 from krupeshf/kpf_waitForDb_waitForEs

Allow users to toggle waiting for db or es to start up
FusionAuth · Jun 21, 2022 · 8ba59f4 · 8ba59f4
2 parents 4a76727 + 8c47149
commit 8ba59f4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -69,6 +69,8 @@ The command removes all the Kubernetes components associated with the chart and
 | ingress.hosts                   | list   | `[]`                                                                                                 | List of hostnames to configure the ingress with                                                                                   |
 | ingress.paths                   | list   | `[]`                                                                                                 |                                                                                                                                   |
 | ingress.tls                     | list   | `[]`                                                                                                 | List of secrets used to configure TLS for the ingress.                                                                            |
+| initContainers.waitForDb        | bool   | `true`                                                                                               | Create an init container which waits for db to be ready                                                                           |
+| initContainers.waitForEs        | bool   | `true`                                                                                               | Create an init container which waits for ES to be ready                                                                           |
 | initContainers.image.repository | string | `"busybox"`                                                                                          | Tag to use for initContainers docker image                                                                                        |
 | initContainers.image.tag        | string | `"latest"`                                                                                           |                                                                                                                                   |
 | initContainers.resources        | object | `{}`                                                                                                 | Resource requests and limits to use for initContainers                                                                            |

diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
@@ -34,7 +34,10 @@ spec:
       imagePullSecrets:
       {{- toYaml .Values.imagePullSecrets | nindent 8 }}
       {{- end }}
+      {{- if or (.Values.extraInitContainers) (or (.Values.initContainers.waitForDb) (and (eq .Values.search.engine "elasticsearch") (.Values.initContainers.waitForEs))) }}
       initContainers:
+      {{- end }}
+        {{- if .Values.initContainers.waitForDb }}
         - name: wait-for-db
           image: "{{ .Values.initContainers.image.repository }}:{{ .Values.initContainers.image.tag }}"
           args:
@@ -48,7 +51,8 @@ spec:
               done
           resources:
             {{- toYaml .Values.initContainers.resources | nindent 12 }}
-        {{- if eq .Values.search.engine "elasticsearch" }}
+        {{- end }}
+        {{- if and (eq .Values.search.engine "elasticsearch") (.Values.initContainers.waitForEs) }}
         - name: wait-for-search
           image: "{{ .Values.initContainers.image.repository }}:{{ .Values.initContainers.image.tag }}"
           args:

diff --git a/chart/values.schema.json b/chart/values.schema.json
@@ -150,6 +150,12 @@
                 },
                 "resources": {
                     "type": "object"
+                },
+                "waitForDb": {
+                    "type": "boolean"
+                },
+                "waitForEs": {
+                    "type": "boolean"
                 }
             }
         },

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -21,6 +21,8 @@ imagePullSecrets: []
 extraInitContainers: []
 
 initContainers:
+  waitForDb: true
+  waitForEs: true
   # This image should contain `nc`, `wget` and a shell of some kind to do a simple loop.
   image:
     # initContainers.image.repository -- Docker image to use for initContainers