From f0e722c373cb700cd74108e72d651a2fac7db04f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Prud=27homme?=
 <sebastien.prudhomme@gmail.com>
Date: Mon, 28 Jan 2019 00:30:22 +0100
Subject: [PATCH] [incubator/couchdb] Fix hardcoded busybox image name (#9435)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sébastien Prud'homme <sebastien.prudhomme@gmail.com>
---
 incubator/couchdb/Chart.yaml                 | 2 +-
 incubator/couchdb/README.md                  | 3 +++
 incubator/couchdb/templates/statefulset.yaml | 3 ++-
 incubator/couchdb/values.yaml                | 5 +++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/incubator/couchdb/Chart.yaml b/incubator/couchdb/Chart.yaml
index c2355a8ea1..657d1d905d 100644
--- a/incubator/couchdb/Chart.yaml
+++ b/incubator/couchdb/Chart.yaml
@@ -1,5 +1,5 @@
 name: couchdb
-version: 1.1.0
+version: 1.1.1
 appVersion: 2.3.0
 description: A database featuring seamless multi-master sync, that scales from
   big data to mobile, with an intuitive HTTP/JSON API and designed for
diff --git a/incubator/couchdb/README.md b/incubator/couchdb/README.md
index 2b2372da09..7cd31a8b81 100644
--- a/incubator/couchdb/README.md
+++ b/incubator/couchdb/README.md
@@ -113,6 +113,9 @@ A variety of other parameters are also configurable. See the comments in the
 | `image.repository`              | couchdb                                |
 | `image.tag`                     | 2.3.0                                  |
 | `image.pullPolicy`              | IfNotPresent                           |
+| `initImage.repository`          | busybox                                |
+| `initImage.tag`                 | latest                                 |
+| `initImage.pullPolicy`          | Always                                 |
 | `ingress.enabled`               | false                                  |
 | `ingress.hosts`                 | chart-example.local                    |
 | `ingress.annotations`           |                                        |
diff --git a/incubator/couchdb/templates/statefulset.yaml b/incubator/couchdb/templates/statefulset.yaml
index 16da6d971d..d7641828ac 100644
--- a/incubator/couchdb/templates/statefulset.yaml
+++ b/incubator/couchdb/templates/statefulset.yaml
@@ -23,7 +23,8 @@ spec:
     spec:
       initContainers:
         - name: init-copy
-          image: busybox
+          image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
+          imagePullPolicy: {{ .Values.initImage.pullPolicy }}
           command: ['sh','-c','cp /tmp/chart.ini /default.d; ls -lrt /default.d;']
           volumeMounts:
           - name: config
diff --git a/incubator/couchdb/values.yaml b/incubator/couchdb/values.yaml
index fb70f86c4e..d1a9816964 100644
--- a/incubator/couchdb/values.yaml
+++ b/incubator/couchdb/values.yaml
@@ -49,6 +49,11 @@ helperImage:
   tag: 1.2.0
   pullPolicy: IfNotPresent
 
+initImage:
+  repository: busybox
+  tag: latest
+  pullPolicy: Always
+
 ## CouchDB is happy to spin up cluster nodes in parallel, but if you encounter
 ## problems you can try setting podManagementPolicy to the StatefulSet default
 ## `OrderedReady`