summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-05-25 13:05:45 +0200
committerKrzysztof Opasiak <k.opasiak@samsung.com>2020-06-11 12:39:44 +0000
commit8c18404e98283be1a3a2d9a86d233b4f7b755900 (patch)
treee8ed94caecac88532f151cd80bd4bc1966863e3c
parent02cf42587f566a39713613f18830feacf036a2df (diff)
[COMMON] Fix bad subchartDot retrieving
readinessCheck was retrieving "subchartDot" in string format and not in "object" format. This commit fixes it Issue-ID: OOM-1971 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I04060f973d283802e6269dc67370a336c5bcf95e
-rw-r--r--kubernetes/common/readinessCheck/templates/_readinessCheck.tpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl
index 5c70e78735..1bdea6bb27 100644
--- a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl
+++ b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl
@@ -40,8 +40,8 @@
{{- $dot := default . .dot -}}
{{- $initRoot := default $dot.Values.readinessCheck .initRoot -}}
{{/* Our version of helm doesn't support deepCopy so we need this nasty trick */}}
-{{- $subchartDot := include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot) }}
-{{- $wait_for := default $dot.Values.wait_for .wait_for -}}
+{{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }}
+{{- $wait_for := default $initRoot.wait_for .wait_for -}}
- name: {{ include "common.name" $dot }}-{{ $wait_for.name }}-readiness
image: "{{ $subchartDot.Values.global.readinessRepository }}/{{ $subchartDot.Values.global.readinessImage }}"
imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }}