[incubator/couchdb] fix env vars for db container (#15162)

Fixes environment variables not being set correctly for the
couchdb container when `.Values.enableSearch` is `false` (the
default).

The feature toggle for search excluded the search container from the
statefulset but did not exclude the associated environment variables.
The result of this was a duplicate `env` field for the `couchdb`
container which would override the correct `env` field; for example,
`ERL_FLAGS` would not be passed to the container.

This comment fixes the scoping of the `.Values.enableSearch` feature
toggle to include the `env` fields for the `clouseau` container.

Signed-off-by: Will Holley <[email protected]>

incubator/couchdb/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: couchdb
-version: 1.2.1
+version: 1.2.2
 appVersion: 2.3.1
 description: A database featuring seamless multi-master sync, that scales from
   big data to mobile, with an intuitive HTTP/JSON API and designed for

incubator/couchdb/templates/statefulset.yaml

@@ -98,11 +98,6 @@ spec:
         - name: couchdb-statefulset-assembler
           image: "{{ .Values.helperImage.repository }}:{{ .Values.helperImage.tag }}"
           imagePullPolicy: {{ .Values.helperImage.pullPolicy }}
-{{- if .Values.enableSearch }}
-        - name: clouseau
-          image: "{{ .Values.searchImage.repository }}:{{ .Values.searchImage.tag }}"
-          imagePullPolicy: {{ .Values.searchImage.pullPolicy }}
-{{- end }}
 {{- if not .Values.allowAdminParty }}
           env:
             - name: COUCHDB_USER
@@ -116,6 +111,11 @@ spec:
                   name: {{ template "couchdb.fullname" . }}
                   key: adminPassword
 {{- end }}
+{{- if .Values.enableSearch }}
+        - name: clouseau
+          image: "{{ .Values.searchImage.repository }}:{{ .Values.searchImage.tag }}"
+          imagePullPolicy: {{ .Values.searchImage.pullPolicy }}
+{{- end }}
 {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}