diff options
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/common/readinessCheck/templates/_readinessCheck.tpl | 4 | ||||
| -rw-r--r-- | kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/onap/Chart.yaml | 2 |
3 files changed, 5 insertions, 5 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 }} diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml index 5b22f06aa8..cde35af14c 100644 --- a/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml +++ b/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml @@ -52,11 +52,11 @@ spec: - name: {{ include "common.fullname" . }}-dbc-dcaelocations mountPath: /opt/app/config/dcaeLocations/ - name: {{ include "common.fullname" . }}-dr-nodes - mountPath: /opt/app/config/dr-nodes/ + mountPath: /opt/app/config/dr_nodes/ - name: {{ include "common.fullname" . }}-feeds mountPath: /opt/app/config/feeds/ - name: {{ include "common.fullname" . }}-mr-clusters - mountPath: /opt/app/config/mr-clusters/ + mountPath: /opt/app/config/mr_clusters/ - name: {{ include "common.fullname" . }}-topics mountPath: /opt/app/config/topics/ resources: {{ include "common.resources" . | nindent 10 }} diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml index 65588b5f39..874d498284 100644 --- a/kubernetes/onap/Chart.yaml +++ b/kubernetes/onap/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 name: onap version: 6.0.0 -appVersion: El Alto +appVersion: Frankfurt description: Open Network Automation Platform (ONAP) home: https://www.onap.org/ sources: |