Not sure what made this commit be separate.
It is intended to be patchset 4 on https://gerrit.onap.org/r/#/c/82150/
But please merge them together.
Change-Id: Ia4c2341e450f0e2910b3ae19becefb6e798e3ef6
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-904
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-make-dmaap: make-dbc make-message-router make-dmaap-dr-node make-dmaap-dr-prov
+make-dmaap: make-dmaap-bc make-message-router make-dmaap-dr-node make-dmaap-dr-prov
 
-make-dbc:
-       cd components && helm dep up dbc && helm lint dbc
+make-dmaap-bc:
+       cd components && helm dep up dmaap-bc && helm lint dmaap-bc
 
 make-message-router:
        cd components && helm dep up message-router && helm lint message-router
 
 
 apiVersion: v1
 description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-bc) in Kubernetes
-name: dbc
+name: dmaap-bc
 version: 4.0.0
 
 spec:
   template:
     metadata:
-      name: "{{.Release.Name}}"
+      name: {{ include "common.fullname" . }}
       labels:
         app.kubernetes.io/managed-by: {{.Release.Service | quote }}
         app.kubernetes.io/instance: {{.Release.Name | quote }}
 
 spec:
   template:
     metadata:
-      name: "{{.Release.Name}}"
+      name: {{ include "common.fullname" . }}
       labels:
         app.kubernetes.io/managed-by: {{.Release.Service | quote }}
         app.kubernetes.io/instance: {{.Release.Name | quote }}
 
 spec:
   template:
     metadata:
-      name: "{{.Release.Name}}"
+      name: {{ include "common.fullname" . }}
       labels:
         app.kubernetes.io/managed-by: {{.Release.Service | quote }}
         app.kubernetes.io/instance: {{.Release.Name | quote }}
         - name: localtime
           hostPath:
             path: /etc/localtime
-#        - name: {{ include "common.name" . }}-config
-#          configMap:
-#            name: {{ include "common.fullname" . }}-config
         - name: {{ include "common.fullname" . }}-dbc-feeds
           configMap:
             name: {{ include "common.fullname" . }}-dbc-feeds
 
 spec:
   template:
     metadata:
-      name: "{{.Release.Name}}"
+      name: {{ include "common.fullname" . }}
       labels:
         app.kubernetes.io/managed-by: {{.Release.Service | quote }}
         app.kubernetes.io/instance: {{.Release.Name | quote }}
 
     version: ~4.x-0
     repository: 'file://components/message-router'
     condition: message-router.enabled
-  - name: dbc
+  - name: dmaap-bc
     version: ~4.x-0
-    repository: 'file://components/dbc'
+    repository: 'file://components/dmaap-bc'
     condition: dmaap-bus-controller.enabled
   - name: dmaap-dr-node
     version: ~4.x-0
 
 
 message-router:
   enabled: true
-dmaap-bus-controller:
-  enabled: true
-dbc:
+dmaap-bc:
   enabled: true
 dmaap-dr-node:
   enabled: true