From c2a3686a6c057a1ebaf4e8562f780e49f57304cf Mon Sep 17 00:00:00 2001 From: Alexander Dehn Date: Wed, 2 Sep 2020 11:48:20 +0000 Subject: [COMMON/elasticsearch] Avoid 'Warning: Merging destination map for chart' restructure values for docker image name:tag Issue-ID: OOM-2533 Signed-off-by: Alexander Dehn Change-Id: I7c02fe543b4f96871c3ade80c7b51c68627cb269 --- .../common/elasticsearch/components/master/templates/statefulset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kubernetes/common/elasticsearch/components/master/templates') diff --git a/kubernetes/common/elasticsearch/components/master/templates/statefulset.yaml b/kubernetes/common/elasticsearch/components/master/templates/statefulset.yaml index 1b5e305f25..626747f075 100644 --- a/kubernetes/common/elasticsearch/components/master/templates/statefulset.yaml +++ b/kubernetes/common/elasticsearch/components/master/templates/statefulset.yaml @@ -84,7 +84,7 @@ spec: {{- end }} containers: - name: {{ include "common.name" . }}-master - image: {{ printf "%s/%s:%s" (include "common.repository" .) .Values.image.imageName .Values.image.tag }} + image: {{ printf "%s/%s" (include "common.repository" .) .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} {{- if .Values.securityContext.enabled }} securityContext: @@ -92,7 +92,7 @@ spec: {{- end }} env: - name: BITNAMI_DEBUG - value: {{ ternary "true" "false" .Values.image.debug | quote }} + value: {{ ternary "true" "false" .Values.debug | quote }} - name: ELASTICSEARCH_CLUSTER_NAME value: {{ include "elasticsearch.clustername" . }} - name: ELASTICSEARCH_CLUSTER_HOSTS -- cgit 1.2.3-korg