From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Mon, 25 May 2020 11:05:45 +0000 (+0200)
Subject: [COMMON] Fix bad subchartDot retrieving
X-Git-Tag: 7.0.0~380^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=8c18404e98283be1a3a2d9a86d233b4f7b755900

[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
---

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 }}