[DMAAP] Remove dmaap-bc charts

The dmaap bus controller is no longer used, so
the corresponding helm charts are being removed.

Issue-ID: OOM-3238
Signed-off-by: Jack Lucas <jflos@sonoris.net>
Change-Id: Ieb83b9a09b5ec804fb18f0c5e85f18f8c1317272

33 files changed, 2 insertions, 1163 deletions

diff --git a/kubernetes/dmaap/Chart.yaml b/kubernetes/dmaap/Chart.yaml
index ba7cbf783d..31c57e31d0 100644
--- a/kubernetes/dmaap/Chart.yaml
+++ b/kubernetes/dmaap/Chart.yaml
@@ -28,10 +28,6 @@ dependencies:
     version: ~13.x-0
     repository: 'file://components/message-router'
     condition: message-router.enabled
-  - name: dmaap-bc
-    version: ~13.x-0
-    repository: 'file://components/dmaap-bc'
-    condition: dmaap-bc.enabled
   - name: dmaap-dr-node
     version: ~13.x-0
     repository: 'file://components/dmaap-dr-node'
diff --git a/kubernetes/dmaap/README.md b/kubernetes/dmaap/README.md
index 8c61b6a012..33362926b0 100644
--- a/kubernetes/dmaap/README.md
+++ b/kubernetes/dmaap/README.md
@@ -1,5 +1,6 @@
 # Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
 # Modifications Copyright © 2018 Amdocs,Bell Canada
+# Copyright (c) 2023 J. F.Lucas.  All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,11 +19,4 @@
 ONAP DMaaP includes the following Kubernetes services:
 
 1) message-router - a message bus for applications
-2) dbc-api - an API to provision DMaaP resources
-3) dmaap-data-router  -  an API to provision data feeds for consumers
-
-# Service Dependencies
-
-message-router depends on AAF
-dmaap-data-router depends on AAF
-dbc-api depends on AAF and Postgresql.
\ No newline at end of file
+2) dmaap-data-router  -  an API to provision data feeds for consumers
diff --git a/kubernetes/dmaap/components/dmaap-bc/.helmignore b/kubernetes/dmaap/components/dmaap-bc/.helmignore
deleted file mode 100644
index f0c1319444..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
deleted file mode 100644
index 3d27a4acc8..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
-# Modifications Copyright © 2018 Amdocs,Bell Canada
-# Modifications Copyright © 2021 Orange
-# Modifications Copyright © 2021-2022 Nordix Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v2
-description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-bc) in Kubernetes
-name: dmaap-bc
-version: 13.0.0
-
-dependencies:
-  - name: common
-    version: ~13.x-0
-    repository: '@local'
-  - name: postgres
-    version: ~13.x-0
-    repository: '@local'
-    condition: postgres.enabled
-  - name: repositoryGenerator
-    version: ~13.x-0
-    repository: '@local'
-  - name: serviceAccount
-    version: ~13.x-0
-    repository: '@local'
-  - name: readinessCheck
-    version: ~13.x-0
-    repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/config/buscontroller.env b/kubernetes/dmaap/components/dmaap-bc/resources/config/buscontroller.env
deleted file mode 100644
index 00c1fe8ee8..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/resources/config/buscontroller.env
+++ /dev/null
@@ -1,18 +0,0 @@
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-# Environment settings for starting a container
-DMAAPBC_WAIT_TO_EXIT=Y
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties b/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
deleted file mode 100644
index e13098bcf1..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
+++ /dev/null
@@ -1,132 +0,0 @@
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-#####################################################
-#
-# Hooks for specific environment configurations
-#
-#####################################################
-# Indicator for whether to use AAF for authentication
-UseAAF: false
-
-#####################################################
-#
-# HTTP Server Configuration
-#
-#####################################################
-
-# Allow http access to dbcapi
-HttpAllowed: true
-
-# listen to http port within this container (server)
-IntHttpPort: 8080
-
-# listen to https port within this container (server)
-# set to 0 if no certificates are available.
-IntHttpsPort: 0
-
-#####################################################
-#
-# Settings for Southbound API: Datarouter
-#
-#####################################################
-# URI to retrieve dynamic DR configuration
-ProvisioningURI:  /internal/prov
-
-# indicator for handling feed delete:
-#  DeleteOnDR - means use the DR API to DELETE a feed.  (default for backwards compatibility)
-#  SimulateDelete - means preserve the feed on DR (after cleaning it up), and mark as DELETED in DBCL.  Better for cloudify environments.
-Feed.deleteHandling: DeleteOnDR
-
-#####################################################
-#
-# Settings for Soutbound API: Postgresql
-#
-#####################################################
-# flag indicates if we are using postgresql or an in memory db
-UsePGSQL: {{ .Values.usePostgres  }}
-
-# postgres host name
-# Need to connect to PG primary service, designated by service.name2
-DB.host: {{ .Values.postgres.service.name2 }}
-
-# postgres schema name
-#DB.schema: {{ .Values.postgres.config.pgDatabase }}
-# postgres user name
-DB.user: ${PG_USER}
-
-# postgres user password
-DB.cred: ${PG_PASSWORD}
-
-#####################################################
-#
-# Settings for Soutbound API: Message Router
-#
-#####################################################
-# indicator for multi-site (locations) deployment.  Give clue to buscontroller whether
-# there is a need for message replication between edge and central.
-# ONAP Casablanca is a single site deployment
-MR.multisite: false
-
-# FQDN of primary message router.
-# In ONAP, there is only 1 message router service, so use that.
-MR.CentralCname: {{ .Values.dmaapMessageRouterService }}
-
-# Indicator for whether we want hostname verification on SSL connection to MR
-MR.hostnameVerify: false
-
-# MR Client Delete Level thoroughness:
-#  0 = don't delete
-#  1 = delete from persistent store
-#  2 = delete from persistent store (DB) and authorization store (AAF)
-MR.ClientDeleteLevel: 1
-
-# Use Basic Authentication when provisioning topics
-MR.authentication: none
-
-ApiPermission.Class: org.onap.dmaap.dbcapi.authentication.AllowAll
-#
-# end of MR Related Properties
-################################################################################
-
-#####################################################
-#
-# Certificate Management
-#
-#####################################################
-# When CertificateManagement is legacy, we need to provide more details about cert handling:
-#CertificateManagement: legacy
-# the type of keystore for https (for legacy CertificateManagment only)
-#KeyStoreType: jks
-
-# path to the keystore file (for legacy CertificateManagment only)
-#KeyStoreFile: etc/keystore
-
-# password for the https keystore (for legacy CertificateManagment only)
-#KeyStorePassword:  Y@Y5f&gm?PAz,CVQL,lk[VAF
-# password for the private key in the https keystore (for legacy CertificateManagment only)
-#KeyPassword: changeit
-
-# type of truststore for https (for legacy CertificateManagment only)
-#TrustStoreType: jks
-
-# path to the truststore for https (for legacy CertificateManagment only)
-#TrustStoreFile: etc/org.onap.dmaap-bc.trust.jks
-
-# password for the https truststore (for legacy CertificateManagment only)
-#TrustStorePassword: changeit
-#
-# END OF legacy CertificateManagement properties
-##########################################################################################
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/dcaeLocations/san-francisco.json b/kubernetes/dmaap/components/dmaap-bc/resources/dcaeLocations/san-francisco.json
deleted file mode 100644
index 6e8e15e7ba..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/resources/dcaeLocations/san-francisco.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "dcaeLayer": "kubernetes-central",
-  "dcaeLocationName": "san-francisco"
-}
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/dmaap/onap.json b/kubernetes/dmaap/components/dmaap-bc/resources/dmaap/onap.json
deleted file mode 100644
index b2295af72e..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/resources/dmaap/onap.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "dmaapName": "{{ include "common.namespace" . }}",
-  "drProvUrl": "http://{{ .Values.dmaapDataRouterProvService }}:8080",
-  "version": "1",
-  "topicNsRoot": "org.onap.dmaap",
-  "bridgeAdminTopic": "DCAE_MM_AGENT"
-}
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/central.yaml b/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/central.yaml
deleted file mode 100644
index 7ef2dcdb8f..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/central.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "dcaeLocationName" : "san-francisco",
-  "fqdn" : "dmaap-dr-node.san-francisco",
-  "hostName" : "dmaap-dr-node.pod",
-  "version" : "1.0.1"
-}
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/edge.yaml b/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/edge.yaml
deleted file mode 100644
index 272cd75e52..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/edge.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "dcaeLocationName" : "edge1",
-  "fqdn" : "dmaap-dr-node.edge1",
-  "hostName" : "dmaap-dr-node.pod.edge1",
-  "version" : "1.0.1"
-}
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/feeds/README b/kubernetes/dmaap/components/dmaap-bc/resources/feeds/README
deleted file mode 100644
index 4f5eac5ba1..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/resources/feeds/README
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Intent of this directory is for it to contain a file for each feed that needs to be provisioned in DR.
-# So, app teams can add files to this directory as needed without impacting each other's code.
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/feeds/test_feed.json b/kubernetes/dmaap/components/dmaap-bc/resources/feeds/test_feed.json
deleted file mode 100644
index d446f7f293..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/resources/feeds/test_feed.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "feedName": "dmaapbc-test-feed",
-  "feedVersion": "1.0",
-  "feedDescription": "test provisioning feed",
-  "asprClassification": "unclassified",
-  "owner": "dmaapbc"
-}
\ No newline at end of file
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/log/logback.xml b/kubernetes/dmaap/components/dmaap-bc/resources/log/logback.xml
deleted file mode 100644
index a827b09f63..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/resources/log/logback.xml
+++ /dev/null
@@ -1,346 +0,0 @@
-
-<!--
-  ============LICENSE_START==========================================
-  org.onap.dmaap
-  ===================================================================
-  Copyright © 2018 AT&T Intellectual Property. All rights reserved.
-  ===================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END============================================
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
--->
-
-<configuration scan="false" scanPeriod="3 seconds">
-  <!--<jmxConfigurator /> -->
-  <!-- directory path for all other type logs -->
-  <property name="logDir" value="logs" />
-  <!--  specify the component name -->
-  <property name="componentName" value="ONAP"/>
-
-  <!--  log file names -->
-  <property name="generalLogName" value="application" />
-  <property name="securityLogName" value="security" />
-  <property name="performanceLogName" value="performance" />
-  <property name="serverLogName" value="server" />
-  <property name="policyLogName" value="policy" />
-  <property name="errorLogName" value="error" />
-  <property name="metricsLogName" value="metrics" />
-  <property name="auditLogName" value="audit" />
-  <property name="debugLogName" value="debug" />
-
-  <property name="defaultPattern" value="%date{ISO8601,UTC}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}|%msg%n" />
-
-  <property name="auditLoggerPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n" />
-  <property name="metricsLoggerPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVirtualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n" />
-  <property name="errorLoggerPattern" value="%date{ISO8601,UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDescription}|%msg%n" />
-  <property name="debugLoggerPattern" value="%date{ISO8601,UTC}|%X{RequestId}|%thread|%msg%n" />
-
-  <property name="logDirectory" value="${logDir}/${componentName}" />
-
-  <!-- Example evaluator filter applied against console appender -->
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>${defaultPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <!-- ============================================================================ -->
-  <!-- EELF Appenders -->
-  <!-- ============================================================================ -->
-
-  <!-- The EELFAppender is used to record events to the general application
-    log -->
-
-
-  <appender name="EELF"
-    class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${generalLogName}.log</file>
-    <rollingPolicy
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/${generalLogName}.%i.log.zip
-      </fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>50MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-      <pattern>${defaultPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELF" />
-  </appender>
-
-  <!-- EELF Security Appender. This appender is used to record security events
-    to the security log file. Security events are separate from other loggers
-    in EELF so that security log records can be captured and managed in a secure
-    way separate from the other logs. This appender is set to never discard any
-    events. -->
-  <appender name="EELFSecurity"
-    class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${securityLogName}.log</file>
-    <rollingPolicy
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/${securityLogName}.%i.log.zip
-      </fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>50MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-      <pattern>${defaultPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <discardingThreshold>0</discardingThreshold>
-    <appender-ref ref="EELFSecurity" />
-  </appender>
-
-  <!-- EELF Performance Appender. This appender is used to record performance
-    records. -->
-  <appender name="EELFPerformance"
-    class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${performanceLogName}.log</file>
-    <rollingPolicy
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/${performanceLogName}.%i.log.zip
-      </fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>50MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-      <pattern>${defaultPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncEELFPerformance" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFPerformance" />
-  </appender>
-
-  <!-- EELF Server Appender. This appender is used to record Server related
-    logging events. The Server logger and appender are specializations of the
-    EELF application root logger and appender. This can be used to segregate Server
-    events from other components, or it can be eliminated to record these events
-    as part of the application root log. -->
-  <appender name="EELFServer"
-    class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${serverLogName}.log</file>
-    <rollingPolicy
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/${serverLogName}.%i.log.zip
-      </fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>50MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-        <pattern>${defaultPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncEELFServer" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFServer" />
-  </appender>
-
-
-  <!-- EELF Policy Appender. This appender is used to record Policy engine
-    related logging events. The Policy logger and appender are specializations
-    of the EELF application root logger and appender. This can be used to segregate
-    Policy engine events from other components, or it can be eliminated to record
-    these events as part of the application root log. -->
-  <appender name="EELFPolicy"
-    class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${policyLogName}.log</file>
-    <rollingPolicy
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/${policyLogName}.%i.log.zip
-      </fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>50MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-        <pattern>${defaultPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncEELFPolicy" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFPolicy" />
-  </appender>
-
-
-  <!-- EELF Audit Appender. This appender is used to record audit engine
-    related logging events. The audit logger and appender are specializations
-    of the EELF application root logger and appender. This can be used to segregate
-    Policy engine events from other components, or it can be eliminated to record
-    these events as part of the application root log. -->
-
-  <appender name="EELFAudit"
-    class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${auditLogName}.log</file>
-    <rollingPolicy
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/${auditLogName}.%i.log.zip
-      </fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>50MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-    <pattern>${auditLoggerPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFAudit" />
-  </appender>
-
-<appender name="EELFMetrics"
-    class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${metricsLogName}.log</file>
-    <rollingPolicy
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/${metricsLogName}.%i.log.zip
-      </fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>50MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-      <pattern>${metricsLoggerPattern}</pattern>
-    </encoder>
-  </appender>
-
-
-  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFMetrics"/>
-  </appender>
-
-  <appender name="EELFError"
-    class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${errorLogName}.log</file>
-    <rollingPolicy
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/${errorLogName}.%i.log.zip
-      </fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>50MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-      <pattern>${errorLoggerPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFError"/>
-  </appender>
-
-   <appender name="EELFDebug"
-    class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${debugLogName}.log</file>
-    <rollingPolicy
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/${debugLogName}.%i.log.zip
-      </fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>50MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-      <pattern>${debugLoggerPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFDebug" />
-    <includeCallerData>true</includeCallerData>
-  </appender>
-
-
-  <!-- ============================================================================ -->
-  <!--  EELF loggers -->
-  <!-- ============================================================================ -->
-  <logger name="com.att.eelf" level="info" additivity="false">
-    <appender-ref ref="asyncEELF" />
-  </logger>
-  <logger name="com.att.eelf.security" level="info" additivity="false">
-    <appender-ref ref="asyncEELFSecurity" />
-  </logger>
-  <logger name="com.att.eelf.perf" level="info" additivity="false">
-    <appender-ref ref="asyncEELFPerformance" />
-  </logger>
-  <logger name="com.att.eelf.server" level="info" additivity="false">
-    <appender-ref ref="asyncEELFServer" />
-  </logger>
-  <logger name="com.att.eelf.policy" level="info" additivity="false">
-    <appender-ref ref="asyncEELFPolicy" />
-  </logger>
-
-  <logger name="com.att.eelf.audit" level="info" additivity="false">
-    <appender-ref ref="asyncEELFAudit" />
-  </logger>
-
-  <logger name="com.att.eelf.metrics" level="info" additivity="false">
-        <appender-ref ref="asyncEELFMetrics" />
-  </logger>
-
-
-   <logger name="com.att.eelf.error" level="error" additivity="false">
-  <appender-ref ref="asyncEELFError" />
-  </logger>
-
-   <logger name="com.att.eelf.debug" level="debug" additivity="false">
-        <appender-ref ref="asyncEELFDebug" />
-  </logger>
-
-  <root level="ERROR">
-    <appender-ref ref="asyncEELF" />
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/mr_clusters/san-francisco.json b/kubernetes/dmaap/components/dmaap-bc/resources/mr_clusters/san-francisco.json
deleted file mode 100644
index 05c898372a..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/resources/mr_clusters/san-francisco.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "dcaeLocationName": "san-francisco",
-  "fqdn": "{{ .Values.dmaapMessageRouterService }}",
-  "topicProtocol": "http",
-  "topicPort": "3904"
-}
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/topics/README b/kubernetes/dmaap/components/dmaap-bc/resources/topics/README
deleted file mode 100644
index fbb88b97e6..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/resources/topics/README
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Intent of this directory is for it to contain a file for each topic that needs to be provisioned in MR.
-# So, app teams can add files to this directory as needed without impacting each other's code.
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/topics/test_topic.json b/kubernetes/dmaap/components/dmaap-bc/resources/topics/test_topic.json
deleted file mode 100644
index 6570ea53d7..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/resources/topics/test_topic.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "topicName": "dmaapbc-test-topic",
-  "topicDescription": "test provisioning topic",
-  "owner": "dmaapbc",
-  "clients": [{
-      "dcaeLocationName": "san-francisco",
-      "clientRole": "org.onap.dmaap.mr.test.pub",
-      "action": [
-        "pub",
-        "view"
-      ]}
-  ]
-}
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml
deleted file mode 100644
index 0dd75f3169..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-{{/*
-# Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
-# Modifications Copyright © 2018 Amdocs,Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-log
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/log/logback.xml").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name:  {{ include "common.fullname" . }}-dbc-dmaap
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/dmaap/*.json").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name:  {{ include "common.fullname" . }}-dbc-dcaelocations
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/dcaeLocations/*.json").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name:  {{ include "common.fullname" . }}-dr-nodes
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/dr_nodes/*.json").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name:  {{ include "common.fullname" . }}-feeds
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/feeds/*.json").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name:  {{ include "common.fullname" . }}-mr-clusters
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/mr_clusters/*.json").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name:  {{ include "common.fullname" . }}-topics
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/topics/*.json").AsConfig . | indent 2 }}
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
deleted file mode 100644
index a7362f23e6..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-{{/*
-# Modifications Copyright © 2018 Amdocs,Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: apps/v1
-kind: Deployment
-metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
-spec:
-  selector: {{- include "common.selectors" . | nindent 4 }}
-  replicas: {{ .Values.replicaCount }}
-  template:
-    metadata: {{- include "common.templateMetadata" . | nindent 6 }}
-    spec:
-      {{ include "common.podSecurityContext" . | indent 6 | trim}}
-      initContainers: {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
-      {{- if .Values.usePostgres }}
-      - command:
-        - sh
-        args:
-        - -c
-        - "cd /config-input && for PFILE in `find . -not -type d | grep -v -F ..`; do envsubst <${PFILE} >/config/${PFILE}; done"
-        env:
-          - name: PG_USER
-            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "login") | indent 12 }}
-          - name: PG_PASSWORD
-            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "password") | indent 12 }}
-        volumeMounts:
-          - mountPath: /config-input
-            name: {{ include "common.name" . }}-config-input
-          - mountPath: /config
-            name: {{ include "common.name" . }}-config
-        name: {{ include "common.name" . }}-update-config
-        image: {{ include "repositoryGenerator.image.envsubst" . }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-      - command:
-        - /app/ready.py
-        args:
-        - --container-name
-        - {{ .Values.postgres.nameOverride }}
-        securityContext:
-          runAsUser: 100
-          runAsGroup: 65533
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        name: {{ include "common.name" . }}-postgres-readiness
-        image: {{ include "repositoryGenerator.image.readiness" . }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-      {{- end }}
-      containers:
-        - name: {{ include "common.name" . }}
-          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          ports: {{ include "common.containerPorts" . | nindent 10  }}
-          {{ if eq .Values.liveness.enabled true -}}
-          livenessProbe:
-            httpGet:
-              port: {{ .Values.liveness.port }}
-              path: /webapi/topics
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.liveness.periodSeconds }}
-          {{ end -}}
-          readinessProbe:
-            httpGet:
-              port: {{ .Values.readiness.port }}
-              path: /webapi/topics
-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.readiness.periodSeconds }}
-          volumeMounts:
-          - mountPath: /etc/localtime
-            name: localtime
-            readOnly: true
-          - name: {{ include "common.name" . }}-config
-            mountPath: /opt/app/config/conf/
-          - mountPath: /opt/app/dmaapbc/etc/logback.xml
-            name: {{ include "common.fullname" . }}-log-conf
-            subPath: logback.xml
-          resources: {{ include "common.resources" . | nindent 12 }}
-        {{- if .Values.nodeSelector }}
-        nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
-        {{- end -}}
-        {{- if .Values.affinity }}
-        affinity: {{ toYaml .Values.affinity | nindent 10 }}
-        {{- end }}
-      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
-      volumes:
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-        - name: {{ include "common.fullname" . }}-log-conf
-          configMap:
-            name: {{ include "common.fullname" . }}-log
-        {{- if .Values.usePostgres }}
-        - name: {{ include "common.name" . }}-config-input
-          configMap:
-            name: {{ include "common.fullname" . }}-config
-        - name: {{ include "common.name" . }}-config
-          emptyDir:
-            medium: Memory
-        {{- else }}
-        - name: {{ include "common.name" . }}-config
-          configMap:
-            name: {{ include "common.fullname" . }}-config
-        {{- end }}
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml
deleted file mode 100644
index f449245f5d..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
-{{/*
-  # ============LICENSE_START===================================================
-  #  Copyright (C) 2022 Nordix Foundation
-  # ============================================================================
-  # Licensed under the Apache License, Version 2.0 (the "License");
-  # you may not use this file except in compliance with the License.
-  # You may obtain a copy of the License at
-  #
-  #      http://www.apache.org/licenses/LICENSE-2.0
-  #
-  # Unless required by applicable law or agreed to in writing, software
-  # distributed under the License is distributed on an "AS IS" BASIS,
-  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  # See the License for the specific language governing permissions and
-  # limitations under the License.
-  #
-  # SPDX-License-Identifier: Apache-2.0
-  # ============LICENSE_END=====================================================
-*/}}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "common.fullname" . }}-dmaap-provisioning
-  namespace: {{ include "common.namespace" . }}
-  labels: {{- include "common.labels" . | nindent 4 }}
-spec:
-  backoffLimit: 20
-  template:
-    metadata: {{- include "common.templateMetadata" . | nindent 6 }}
-    spec:
-      restartPolicy: Never
-      initContainers:
-      - name: {{ include "common.name" . }}-init-readiness
-        image: {{ include "repositoryGenerator.image.readiness" . }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        command:
-        - /app/ready.py
-        args:
-        - --container-name
-        - {{ include "common.name" . }}
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-      containers:
-      - name: dmaap-provisioning-job
-        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.dbcClientImage }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        env:
-        - name: DELAY
-          value: "0"
-        - name: PROTO
-          value: "http"
-        - name: PORT
-          value: "8080"
-        - name: REQUESTID
-          value: "{{.Chart.Name}}-dmaap-provisioning"
-        volumeMounts:
-        - mountPath: /etc/localtime
-          name: localtime
-          readOnly: true
-# NOTE: on the following several configMaps, careful to include / at end
-#       since there may be more than one file in each mountPath
-# NOTE: the basename of the subdirectory of mountPath is important - it matches the DBCL API URI
-        - name:  {{ include "common.fullname" . }}-dbc-dmaap
-          mountPath: /opt/app/config/dmaap/
-        - name:  {{ include "common.fullname" . }}-dbc-dcaelocations
-          mountPath: /opt/app/config/dcaeLocations/
-        - name:  {{ include "common.fullname" . }}-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/
-        - name:  {{ include "common.fullname" . }}-topics
-          mountPath: /opt/app/config/topics/
-        resources: {{ include "common.resources" . | nindent 10 }}
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
-        {{- if .Values.nodeSelector }}
-      nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
-        {{- end -}}
-        {{- if .Values.affinity }}
-      affinity: {{ toYaml .Values.affinity | nindent 8 }}
-        {{- end }}
-      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
-      volumes:
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-        - name: {{ include "common.fullname" . }}-dbc-dmaap
-          configMap:
-            name: {{ include "common.fullname" . }}-dbc-dmaap
-        - name: {{ include "common.fullname" . }}-dbc-dcaelocations
-          configMap:
-            name: {{ include "common.fullname" . }}-dbc-dcaelocations
-        - name: {{ include "common.fullname" . }}-dr-nodes
-          configMap:
-            name: {{ include "common.fullname" . }}-dr-nodes
-        - name: {{ include "common.fullname" . }}-feeds
-          configMap:
-            name: {{ include "common.fullname" . }}-feeds
-        - name: {{ include "common.fullname" . }}-mr-clusters
-          configMap:
-            name: {{ include "common.fullname" . }}-mr-clusters
-        - name: {{ include "common.fullname" . }}-topics
-          configMap:
-            name: {{ include "common.fullname" . }}-topics
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/ingress.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/ingress.yaml
deleted file mode 100644
index a90bf83c07..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/templates/ingress.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{/*
-# Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
-# Modifications Copyright © 2018 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-{{ include "common.ingress" . }}
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/secrets.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/secrets.yaml
deleted file mode 100644
index b7a31c0b0c..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/templates/secrets.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Modifications Copyright © 2019 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{ include "common.secretFast" . }}
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/service.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/service.yaml
deleted file mode 100644
index e658a712a0..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/templates/service.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{/*
-# Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
-# Modifications Copyright © 2018 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-{{ include "common.service" . }}
diff --git a/kubernetes/dmaap/components/dmaap-bc/values.yaml b/kubernetes/dmaap/components/dmaap-bc/values.yaml
deleted file mode 100644
index 5c291f063e..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/values.yaml
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
-# Modifications Copyright © 2018 Amdocs,Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#################################################################
-# Global configuration defaults.
-#################################################################
-global:
-  persistence: {}
-
-#################################################################
-# Secrets metaconfig
-#################################################################
-secrets:
-  - uid: pg-root-pass
-    name: &pgRootPassSecretName '{{ include "common.release" . }}-dmaap-bc-pg-root-pass'
-    type: password
-    externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgRootPasswordExternalSecret) .) (hasSuffix "dmaap-bc-pg-root-pass" .Values.postgres.config.pgRootPasswordExternalSecret) }}'
-    password: '{{ .Values.postgres.config.pgRootpassword }}'
-    policy: generate
-  - uid: pg-user-creds
-    name: &pgUserCredsSecretName '{{ include "common.release" . }}-dmaap-bc-pg-user-creds'
-    type: basicAuth
-    externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgUserExternalSecret) .) (hasSuffix "dmaap-bc-pg-user-creds" .Values.postgres.config.pgUserExternalSecret) }}'
-    login: '{{ .Values.postgres.config.pgUserName }}'
-    password: '{{ .Values.postgres.config.pgUserPassword }}'
-    passwordPolicy: generate
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-# application images
-image: onap/dmaap/dmaap-bc:2.0.12
-pullPolicy: Always
-
-#DMaaP Bus Controller client image for provisioning at deploy time
-dbcClientImage: onap/dmaap/dbc-client:2.0.12
-
-# application configuration
-dmaapMessageRouterService: &mr_name message-router
-dmaapDataRouterProvService: &dr_prov_name dmaap-dr-prov
-dmaapDataRouterNodeService: &dr_node_name dmaap-dr-node
-
-nodeSelector: {}
-
-affinity: {}
-
-containerPort: &svc_port 8080
-
-service:
-  type: ClusterIP
-  name: &svc_name dmaap-bc
-  ports:
-    - name: &port http
-      port: *svc_port
-
-ingress:
-  enabled: false
-  service:
-    - baseaddr: "dmaap-bc-api"
-      name: *svc_name
-      port: *svc_port
-  config:
-    ssl: "redirect"
-
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 10
-  periodSeconds: 10
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
-  port: *svc_port
-  enabled: true
-
-readiness:
-  initialDelaySeconds: 10
-  periodSeconds: 10
-  port: *svc_port
-
-usePostgres: &use_pg true
-
-postgres:
-# For Dev deployments, use in memory DB
-# postgres
-#   enabled: false
-  enabled: true
-  nameOverride: &pg_name dbc-postgres
-  service:
-    name: *pg_name
-    name2: dbc-pg-primary
-    name3: dbc-pg-replica
-  container:
-    name:
-      primary: dbc-pg-primary
-      replica: dbc-pg-replica
-  config:
-    pgUserName: dmaap_admin
-    pgDatabase: dmaap
-    pgUserExternalSecret: *pgUserCredsSecretName
-    pgRootPasswordExternalSecret: *pgRootPassSecretName
-  persistence:
-    mountSubPath: dbc/data
-    mountInitPath: dbc
-
-# Resource Limit flavor -By Default using small
-flavor: small
-
-# Segregation for Different environment (Small and Large)
-resources:
-  small:
-    limits:
-      cpu: 999
-      memory: 1Gi
-    requests:
-      cpu: 1
-      memory: 1Gi
-  large:
-    limits:
-      cpu: 999
-      memory: 2Gi
-    requests:
-      cpu: 2
-      memory: 2Gi
-  unlimited: {}
-
-securityContext:
-  user_id: 1000
-  group_id: 101
-
-#Pods Service Account
-serviceAccount:
-  nameOverride: *svc_name
-  roles:
-    - read
-
-readinessCheck:
-  wait_for:
-    - *mr_name
-    - *dr_node_name
-
-wait_for_job_container:
-  containers:
-    - 'dmaap-provisioning-job'
\ No newline at end of file
diff --git a/kubernetes/dmaap/values.yaml b/kubernetes/dmaap/values.yaml
index 4536f2b54b..6faab9cdbc 100644
--- a/kubernetes/dmaap/values.yaml
+++ b/kubernetes/dmaap/values.yaml
@@ -22,11 +22,6 @@ global:
 #Component overrides
 message-router:
   enabled: true
-dmaap-bc:
-  enabled: true
-  usePostgres: true
-  postgres:
-    enabled: true
 dmaap-dr-node:
   enabled: true
 dmaap-dr-prov:
diff --git a/kubernetes/onap/resources/environments/core-onap.yaml b/kubernetes/onap/resources/environments/core-onap.yaml
index 87c27f743b..fd33073aef 100644
--- a/kubernetes/onap/resources/environments/core-onap.yaml
+++ b/kubernetes/onap/resources/environments/core-onap.yaml
@@ -67,8 +67,6 @@ dmaap:
   enabled: true
   message-router:
     enabled: true
-  dmaap-bc:
-    enabled: false
   dmaap-dr-prov:
     enabled: false
   dmaap-dr-node:
diff --git a/kubernetes/onap/resources/environments/minimal-onap.yaml b/kubernetes/onap/resources/environments/minimal-onap.yaml
index e581ddc8c4..4b8f3a2892 100644
--- a/kubernetes/onap/resources/environments/minimal-onap.yaml
+++ b/kubernetes/onap/resources/environments/minimal-onap.yaml
@@ -60,8 +60,6 @@ dmaap:
   enabled: true
   message-router:
     enabled: true
-  dmaap-bc:
-    enabled: false
   dmaap-dr-prov:
     enabled: false
   dmaap-dr-node:
diff --git a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
index 9cfd3703b8..e421841155 100644
--- a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
+++ b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
@@ -86,8 +86,6 @@ dmaap:
   enabled: true
   message-router:
     enabled: true
-  dmaap-bc:
-    enabled: false
   dmaap-dr-prov:
     enabled: false
   dmaap-dr-node:
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
index eeb5fc453b..f38df6861e 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
@@ -121,8 +121,6 @@ dmaap:
   enabled: true
   message-router:
     enabled: true
-  dmaap-bc:
-    enabled: true
   dmaap-dr-prov:
     enabled: true
   dmaap-dr-node:
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
index 6d94f9912e..523e82c70a 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
@@ -56,8 +56,6 @@ dmaap:
   enabled: true
   message-router:
     enabled: true
-  dmaap-bc:
-    enabled: true
   dmaap-dr-prov:
     enabled: true
   dmaap-dr-node:
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 4efe514513..239fb45989 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -79,8 +79,6 @@ dmaap:
   enabled: true
   message-router:
     enabled: true
-  dmaap-bc:
-    enabled: true
   dmaap-dr-prov:
     enabled: true
   dmaap-dr-node:
diff --git a/kubernetes/onap/resources/overrides/onap-vfw.yaml b/kubernetes/onap/resources/overrides/onap-vfw.yaml
index c7eb6f2a99..317d4ecd94 100644
--- a/kubernetes/onap/resources/overrides/onap-vfw.yaml
+++ b/kubernetes/onap/resources/overrides/onap-vfw.yaml
@@ -31,8 +31,6 @@ dmaap:
   enabled: true
   message-router:
     enabled: true
-  dmaap-bc:
-    enabled: false
   dmaap-dr-prov:
     enabled: false
   dmaap-dr-node:
diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml
index 47f141a51b..38a202ce09 100644
--- a/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@ -73,8 +73,6 @@ dmaap:
   enabled: true
   message-router:
     enabled: true
-  dmaap-bc:
-    enabled: true
   dmaap-dr-prov:
     enabled: true
   dmaap-dr-node:
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index e1d54b4c7f..1f40bd3906 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -301,8 +301,6 @@ dmaap:
   enabled: false
   message-router:
     enabled: false
-  dmaap-bc:
-    enabled: false
   dmaap-dr-prov:
     enabled: false
   dmaap-dr-node: