From df11cd53bffd239887ec4a406dc5281aa217b2ca Mon Sep 17 00:00:00 2001
From: BorislavG <Borislav.Glozman@amdocs.com>
Date: Sun, 6 May 2018 12:55:20 +0000
Subject: Fix inconsistent repository references

Issue-ID: OOM-874

Changes to be committed:
	modified:   aai/charts/aai-babel/templates/deployment.yaml
	modified:   aai/charts/aai-champ/templates/deployment.yaml
	modified:   aai/charts/aai-data-router/templates/deployment.yaml
	modified:   aai/charts/aai-gizmo/templates/deployment.yaml
	modified:   aai/charts/aai-modelloader/templates/deployment.yaml
	modified:   aai/charts/aai-resources/templates/deployment.yaml
	modified:   aai/charts/aai-search-data/templates/deployment.yaml
	modified:   aai/charts/aai-sparky-be/templates/deployment.yaml
	modified:   aai/charts/aai-traversal/templates/deployment.yaml
	modified:   aai/charts/aai-traversal/templates/job.yaml
	modified:   appc/charts/appc-cdt/templates/deployment.yaml
	modified:   appc/templates/statefulset.yaml
	modified:   clamp/charts/mariadb/templates/deployment.yaml
	modified:   clamp/templates/deployment.yaml
	modified:   cli/templates/deployment.yaml
	modified:   common/dgbuilder/templates/deployment.yaml
	modified:   common/mariadb-galera/templates/statefulset.yaml
	modified:   dcaegen2/charts/dcae-bootstrap/templates/job.yaml
	modified:   dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml
	modified:   dcaegen2/charts/dcae-healthcheck/templates/deployment.yaml
	modified:   dcaegen2/charts/dcae-redis/templates/statefulset.yaml
	modified:   dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
	modified:   dmaap/charts/dmaap-bus-controller/values.yaml
	modified:   esr/charts/esr-gui/templates/deployment.yaml
	modified:   esr/templates/deployment.yaml
	modified:   msb/charts/kube2msb/templates/deployment.yaml
	modified:   msb/charts/msb-discovery/templates/deployment.yaml
	modified:   msb/charts/msb-eag/templates/deployment.yaml
	modified:   msb/charts/msb-iag/templates/deployment.yaml
	modified:   multicloud/charts/multicloud-ocata/templates/deployment.yaml
	modified:   multicloud/charts/multicloud-vio/templates/deployment.yaml
	modified:   multicloud/charts/multicloud-windriver/templates/deployment.yaml
	modified:   multicloud/templates/deployment.yaml
	modified:   policy/charts/brmsgw/templates/deployment.yaml
	modified:   policy/charts/drools/charts/nexus/templates/deployment.yaml
	modified:   policy/charts/drools/templates/statefulset.yaml
	modified:   policy/charts/mariadb/templates/deployment.yaml
	modified:   policy/charts/pdp/templates/statefulset.yaml
	modified:   policy/templates/deployment.yaml
	modified:   portal/charts/portal-app/templates/deployment.yaml
	modified:   portal/charts/portal-cassandra/templates/deployment.yaml
	modified:   portal/charts/portal-mariadb/templates/deployment.yaml
	modified:   portal/charts/portal-sdk/templates/deployment.yaml
	modified:   portal/charts/portal-widget/templates/deployment.yaml
	modified:   portal/charts/portal-zookeeper/templates/deployment.yaml
	modified:   sdnc/charts/dmaap-listener/templates/deployment.yaml
	modified:   sdnc/charts/sdnc-portal/templates/deployment.yaml
	modified:   sdnc/charts/ueb-listener/templates/deployment.yaml
	modified:   sdnc/templates/statefulset.yaml
	modified:   uui/charts/uui-server/templates/deployment.yaml
	modified:   uui/templates/deployment.yaml
	modified:   vid/charts/mariadb/templates/deployment.yaml
	modified:   vid/templates/deployment.yaml

Change-Id: I00aaa1eff3b870db3b475365eeda3f2e10aef6b9
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
---
 .../dmaap/charts/dmaap-bus-controller/templates/deployment.yaml       | 2 +-
 kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml              | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'kubernetes/dmaap/charts/dmaap-bus-controller')

diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
index 2c38792c87..32d6fe0612 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
@@ -47,7 +47,7 @@ spec:
         name: {{ include "common.name" . }}-readiness
       containers:
         - name: {{ include "common.name" . }}
-          image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image.buscontrollerImage }}:{{ .Values.image.buscontrollerVersion }}"
+          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:
           - containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
index 3acb490e57..14b23e5084 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
@@ -32,9 +32,7 @@ pullPolicy: Always
 # application images
 repository: nexus3.onap.org:10001
 
-image:
-  buscontrollerImage: onap/dmaap/buscontroller
-  buscontrollerVersion: 1.0.8
+image: onap/dmaap/buscontroller:1.0.8
 
 
 # application configuration
-- 
cgit 1.2.3-korg