From 8c18404e98283be1a3a2d9a86d233b4f7b755900 Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Mon, 25 May 2020 13:05:45 +0200 Subject: [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 Change-Id: I04060f973d283802e6269dc67370a336c5bcf95e --- kubernetes/common/readinessCheck/templates/_readinessCheck.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kubernetes') 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 }} -- cgit 1.2.3-korg