aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-06-19 22:40:09 +0000
committerGerrit Code Review <gerrit@onap.org>2020-06-19 22:40:09 +0000
commit02d4369129f6928360a8a52a62f636f973409a6e (patch)
treecbe277f355d7d546cd180b6676aebb4d10fc4324 /kubernetes
parent9c2c7cfe29b0fb2cad1f13ab5b50e896aac1007a (diff)
parent8c18404e98283be1a3a2d9a86d233b4f7b755900 (diff)
Merge "[COMMON] Fix bad subchartDot retrieving"
Diffstat (limited to 'kubernetes')
-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 }}