From 7d11ca9ba3b6cee1849f1d24d276df99800fc5fe Mon Sep 17 00:00:00 2001
From: Michael Lorant <mikel@mlvision.com.au>
Date: Wed, 10 Apr 2019 21:40:12 +1000
Subject: [PATCH] [stable/elasticsearch-curator] Add support for init
 containers (#12772)

* Add support for init containers

Signed-off-by: Michael Lorant <mikel@mlvision.com.au>

* Follow convention for init container Helm values

Signed-off-by: Michael Lorant <mikel@mlvision.com.au>

* Add init container values test

Signed-off-by: Michael Lorant <mikel@mlvision.com.au>
---
 stable/elasticsearch-curator/Chart.yaml       |  2 +-
 stable/elasticsearch-curator/README.md        |  4 ++-
 .../ci/initcontainer-values.yaml              |  9 +++++
 .../templates/cronjob.yaml                    |  7 ++++
 stable/elasticsearch-curator/values.yaml      | 35 +++++++++++++++++++
 5 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 stable/elasticsearch-curator/ci/initcontainer-values.yaml

diff --git a/stable/elasticsearch-curator/Chart.yaml b/stable/elasticsearch-curator/Chart.yaml
index 24a37ce4a0..371e7028f3 100644
--- a/stable/elasticsearch-curator/Chart.yaml
+++ b/stable/elasticsearch-curator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "5.5.4"
 description: A Helm chart for Elasticsearch Curator
 name: elasticsearch-curator
-version: 1.3.2
+version: 1.4.0
 home: https://github.com/elastic/curator
 keywords:
 - curator
diff --git a/stable/elasticsearch-curator/README.md b/stable/elasticsearch-curator/README.md
index 0a9f311aa7..cfae29884c 100644
--- a/stable/elasticsearch-curator/README.md
+++ b/stable/elasticsearch-curator/README.md
@@ -52,6 +52,8 @@ their default values.
 | `priorityClassName`                  | priorityClassName                                           | `nil`                                        |
 | `extraVolumeMounts`                  | Mount extra volume(s),                                      |                                              |
 | `extraVolumes`                       | Extra volumes                                               |                                              |
-| `securityContext`                    | Configure PodSecurityContext                          |
+| `extraInitContainers`                | Init containers to add to the cronjob container             | {}                                           |
+| `securityContext`                    | Configure PodSecurityContext                                |                                              |
+
 Specify each parameter using the `--set key=value[,key=value]` argument to
 `helm install`.
diff --git a/stable/elasticsearch-curator/ci/initcontainer-values.yaml b/stable/elasticsearch-curator/ci/initcontainer-values.yaml
new file mode 100644
index 0000000000..578becf3f8
--- /dev/null
+++ b/stable/elasticsearch-curator/ci/initcontainer-values.yaml
@@ -0,0 +1,9 @@
+extraInitContainers:
+  test:
+    image: alpine:latest
+    command:
+    - "/bin/sh"
+    - "-c"
+    args:
+    - |
+      true
diff --git a/stable/elasticsearch-curator/templates/cronjob.yaml b/stable/elasticsearch-curator/templates/cronjob.yaml
index d0388f47bc..6b5e16cc4b 100644
--- a/stable/elasticsearch-curator/templates/cronjob.yaml
+++ b/stable/elasticsearch-curator/templates/cronjob.yaml
@@ -52,6 +52,13 @@ spec:
 {{- if .Values.image.pullSecret }}
           imagePullSecrets:
             - name: {{ .Values.image.pullSecret }}
+{{- end }}
+{{- if .Values.extraInitContainers }}
+          initContainers:
+{{- range $key, $value := .Values.extraInitContainers }}
+          - name: "{{ $key }}"
+{{ toYaml $value | indent 12 }}
+{{- end }}
 {{- end }}
           containers:
             - name: {{ .Chart.Name }}
diff --git a/stable/elasticsearch-curator/values.yaml b/stable/elasticsearch-curator/values.yaml
index 3779be1d7a..9274b1e502 100644
--- a/stable/elasticsearch-curator/values.yaml
+++ b/stable/elasticsearch-curator/values.yaml
@@ -101,5 +101,40 @@ priorityClassName: ""
 #     mountPath: /certs
 #     readOnly: true
 
+# Add your own init container or uncomment and modify the given example.
+extraInitContainers: {}
+  ## Don't configure S3 repository till Elasticsearch is reachable.
+  ## Ensure that it is available at http://elasticsearch:9200
+  ##
+  # elasticsearch-s3-repository:
+  #   image: jwilder/dockerize:latest
+  #   imagePullPolicy: "IfNotPresent"
+  #   command:
+  #   - "/bin/sh"
+  #   - "-c"
+  #   args:
+  #   - |
+  #     ES_HOST=elasticsearch
+  #     ES_PORT=9200
+  #     ES_REPOSITORY=backup
+  #     S3_REGION=us-east-1
+  #     S3_BUCKET=bucket
+  #     S3_BASE_PATH=backup
+  #     S3_COMPRESS=true
+  #     S3_STORAGE_CLASS=standard
+  #     apk add curl --no-cache && \
+  #     dockerize -wait http://${ES_HOST}:${ES_PORT} --timeout 120s && \
+  #     cat <<EOF | curl -sS -XPUT -H "Content-Type: application/json" -d @- http://${ES_HOST}:${ES_PORT}/_snapshot/${ES_REPOSITORY} \
+  #     {
+  #       "type": "s3",
+  #       "settings": {
+  #         "bucket": "${S3_BUCKET}",
+  #         "base_path": "${S3_BASE_PATH}",
+  #         "region": "${S3_REGION}",
+  #         "compress": "${S3_COMPRESS}",
+  #         "storage_class": "${S3_STORAGE_CLASS}"
+  #       }
+  #     }
+
 securityContext:
   runAsUser: 16  # run as cron user instead of root