[COMMON] Cleanup charts

- archive charts, which are not maintained anymore
- archive subcharts in SDNC, MSB, DCAEGEN2-SERVICES
- Cleanup environment and override files

Issue-ID: OOM-3309
Issue-ID: ONAPARC-805

Change-Id: If19a807fefa574ceb9b90ac1eb84d9642729323d
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>

10 files changed, 0 insertions, 805 deletions

diff --git a/kubernetes/dmaap/components/message-router/.helmignore b/kubernetes/dmaap/components/message-router/.helmignore
deleted file mode 100644
index f0c1319444..0000000000
--- a/kubernetes/dmaap/components/message-router/.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/message-router/Chart.yaml b/kubernetes/dmaap/components/message-router/Chart.yaml
deleted file mode 100644
index adc0599e94..0000000000
--- a/kubernetes/dmaap/components/message-router/Chart.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-# Modifications Copyright © 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: ONAP Message Router
-name: message-router
-version: 13.0.0
-
-dependencies:
-  - name: common
-    version: ~13.x-0
-    # local reference to common chart, as it is
-    # a part of this chart's package and will not
-    # be published independently to a repo (at this point)
-    repository: '@local'
-  - name: repositoryGenerator
-    version: ~13.x-0
-    repository: '@local'
-  - name: serviceAccount
-    version: ~13.x-0
-    repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/Makefile b/kubernetes/dmaap/components/message-router/Makefile
deleted file mode 100644
index ef273d0e9b..0000000000
--- a/kubernetes/dmaap/components/message-router/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright © 2020 Samsung Electronics
-#
-# 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.
-
-ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-OUTPUT_DIR := $(ROOT_DIR)/../dist
-PACKAGE_DIR := $(OUTPUT_DIR)/packages
-SECRET_DIR := $(OUTPUT_DIR)/secrets
-
-EXCLUDES := dist resources templates charts docker
-HELM_BIN := helm
-ifneq ($(SKIP_LINT),TRUE)
-	HELM_LINT_CMD := $(HELM_BIN) lint
-else
-	HELM_LINT_CMD := echo "Skipping linting of"
-endif
-
-HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
-
-.PHONY: $(EXCLUDES) $(HELM_CHARTS)
-
-all: $(HELM_CHARTS)
-
-$(HELM_CHARTS):
-	@echo "\n[$@]"
-	@make package-$@
-
-make-%:
-	@if [ -f $*/Makefile ]; then make -C $*; fi
-
-dep-%: make-%
-	@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
-
-lint-%: dep-%
-	@if [ -f $*/Chart.yaml ]; then $(HELM_LINT_CMD) $*; fi
-
-package-%: lint-%
-	@mkdir -p $(PACKAGE_DIR)
-	@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
-	@sleep 3
-	#@$(HELM_BIN) repo index $(PACKAGE_DIR)
-
-clean:
-	@rm -f */Chart.lock
-	@rm -f *tgz */charts/*tgz
-	@rm -rf $(PACKAGE_DIR)
-%:
-	@:
diff --git a/kubernetes/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties b/kubernetes/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties
deleted file mode 100755
index 2dea84d289..0000000000
--- a/kubernetes/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties
+++ /dev/null
@@ -1,135 +0,0 @@
-{{/*
-# LICENSE_START=======================================================
-#  org.onap.dmaap
-#  ================================================================================
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#  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.
-#  ============LICENSE_END=========================================================
-#
-#  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
-###############################################################################
-###############################################################################
-*/}}
-##
-## Kafka Connection
-##
-##        Items below are passed through to Kafka's producer and consumer
-##        configurations (after removing "kafka.")
-##        if you want to change request.required.acks it can take this one value
-#kafka.request.required.acks=-1
-kafka.metadata.broker.list={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
-config.zk.servers=127.0.0.1:{{ .Values.zkTunnelService.internalPort }}
-consumer.timeout.ms=100
-zookeeper.connection.timeout.ms=6000
-zookeeper.session.timeout.ms=20000
-zookeeper.sync.time.ms=2000
-auto.commit.interval.ms=1000
-fetch.message.max.bytes =1000000
-auto.commit.enable=false
-
-#(backoff*retries > zksessiontimeout)
-kafka.rebalance.backoff.ms=10000
-kafka.rebalance.max.retries=6
-
-
-###############################################################################
-##
-##        Secured Config
-##
-##        Some data stored in the config system is sensitive -- API keys and secrets,
-##        for example. to protect it, we use an encryption layer for this section
-##        of the config.
-##
-## The key is a base64 encode AES key. This must be created/configured for
-## each installation.
-#cambria.secureConfig.key=
-##
-## The initialization vector is a 16 byte value specific to the secured store.
-## This must be created/configured for each installation.
-#cambria.secureConfig.iv=
-
-## Southfield Sandbox
-cambria.secureConfig.key=b/7ouTn9FfEw2PQwL0ov/Q==
-cambria.secureConfig.iv=wR9xP5k5vbz/xD0LmtqQLw==
-authentication.adminSecret=fe3cCompound
-#cambria.secureConfig.key[pc569h]=YT3XPyxEmKCTLI2NK+Sjbw==
-#cambria.secureConfig.iv[pc569h]=rMm2jhR3yVnU+u2V9Ugu3Q==
-
-
-###############################################################################
-##
-## Consumer Caching
-##
-##        Kafka expects live connections from the consumer to the broker, which
-##        obviously doesn't work over connectionless HTTP requests. The Cambria
-##        server proxies HTTP requests into Kafka consumer sessions that are kept
-##        around for later re-use. Not doing so is costly for setup per request,
-##        which would substantially impact a high volume consumer's performance.
-##
-##        This complicates Cambria server failover, because we often need server
-##        A to close its connection before server B brings up the replacement.
-##
-
-## The consumer cache is normally enabled.
-#cambria.consumer.cache.enabled=true
-
-## Cached consumers are cleaned up after a period of disuse. The server inspects
-## consumers every sweepFreqSeconds and will clean up any connections that are
-## dormant for touchFreqMs.
-#cambria.consumer.cache.sweepFreqSeconds=15
-cambria.consumer.cache.touchFreqMs=120000
-##stickforallconsumerrequests=false
-## The cache is managed through ZK. The default value for the ZK connection
-## string is the same as config.zk.servers.
-#cambria.consumer.cache.zkConnect=${config.zk.servers}
-
-##
-## Shared cache information is associated with this node's name. The default
-## name is the hostname plus the HTTP service port this host runs on. (The
-## hostname is determined via InetAddress.getLocalHost ().getCanonicalHostName(),
-## which is not always adequate.) You can set this value explicitly here.
-##
-#cambria.api.node.identifier=<use-something-unique-to-this-instance>
-
-#cambria.rateLimit.maxEmptyPollsPerMinute=30
-#cambria.rateLimitActual.delay.ms=10
-
-###############################################################################
-##
-## Metrics Reporting
-##
-##        This server can report its metrics periodically on a topic.
-##
-#metrics.send.cambria.enabled=true
-#metrics.send.cambria.topic=cambria.apinode.metrics                                  #msgrtr.apinode.metrics.dmaap
-#metrics.send.cambria.sendEverySeconds=60
-
-cambria.consumer.cache.zkBasePath=/fe3c/cambria/consumerCache
-consumer.timeout=17
-default.partitions=3
-default.replicas=3
-##############################################################################
-#100mb
-maxcontentlength=10000
-
-##############################################################################
-##AAF Properties
-forceAAF=false
-useCustomAcls=false
-
-kafka.max.poll.interval.ms=300000
-kafka.heartbeat.interval.ms=60000
-kafka.session.timeout.ms=240000
-kafka.max.poll.records=1000
diff --git a/kubernetes/dmaap/components/message-router/resources/config/dmaap/logback.xml b/kubernetes/dmaap/components/message-router/resources/config/dmaap/logback.xml
deleted file mode 100644
index 949a893197..0000000000
--- a/kubernetes/dmaap/components/message-router/resources/config/dmaap/logback.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<!--
-     ============LICENSE_START=======================================================
-     Copyright © 2019 AT&T Intellectual Property. All rights reserved.
-     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.
-     ============LICENSE_END=========================================================
- -->
-
-<configuration scan="true" scanPeriod="3 seconds" debug="true">
-  <contextName>${module.ajsc.namespace.name}</contextName>
-  <jmxConfigurator />
-  <property name="logDirectory" value="${AJSC_HOME}/log" />
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
-      </pattern>
-    </encoder>
-  </appender>
-
-  <appender name="INFO" class="ch.qos.logback.core.ConsoleAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-  </appender>
-
-  <appender name="DEBUG" class="ch.qos.logback.core.ConsoleAppender">
-
-    <encoder>
-      <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="ERROR" class="ch.qos.logback.core.ConsoleAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>ERROR</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <encoder>
-      <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-    </encoder>
-  </appender>
-
-
-  <!-- Msgrtr related loggers -->
-  <logger name="org.onap.dmaap.dmf.mr.service" level="TRACE" />
-  <logger name="org.onap.dmaap.dmf.mr.service.impl" level="TRACE" />
-
-  <logger name="org.onap.dmaap.dmf.mr.resources" level="TRACE" />
-  <logger name="org.onap.dmaap.dmf.mr.resources.streamReaders" level="TRACE" />
-
-  <logger name="org.onap.dmaap.dmf.mr.backends" level="TRACE" />
-  <logger name="org.onap.dmaap.dmf.mr.backends.kafka" level="TRACE" />
-  <logger name="org.onap.dmaap.dmf.mr.backends.memory" level="TRACE" />
-
-  <logger name="org.onap.dmaap.dmf.mr.beans" level="TRACE" />
-
-  <logger name="org.onap.dmaap.dmf.mr.constants" level="TRACE" />
-
-  <logger name="org.onap.dmaap.dmf.mr.exception" level="TRACE" />
-
-  <logger name="org.onap.dmaap.dmf.mr.listener" level="TRACE" />
-
-  <logger name="org.onap.dmaap.dmf.mr.metabroker" level="TRACE" />
-
-  <logger name="org.onap.dmaap.dmf.mr.metrics.publisher" level="TRACE" />
-  <logger name="org.onap.dmaap.dmf.mr.metrics.publisher.impl" level="TRACE" />
-
-
-
-  <logger name="org.onap.dmaap.dmf.mr.security" level="TRACE" />
-  <logger name="org.onap.dmaap.dmf.mr.security.impl" level="TRACE" />
-
-  <logger name="org.onap.dmaap.dmf.mr.transaction" level="TRACE" />
-  <logger name="com.att.dmf.mr.transaction.impl" level="TRACE" />
-
-  <logger name="org.onap.dmaap.dmf.mr.metabroker" level="TRACE" />
-  <logger name="org.onap.dmaap.dmf.mr.metabroker" level="TRACE" />
-
-  <logger name="org.onap.dmaap.dmf.mr.utils" level="TRACE" />
-  <logger name="org.onap.dmaap.mr.filter" level="TRACE" />
-
-  <!--<logger name="com.att.nsa.cambria.*" level="TRACE" />-->
-
-  <!-- Msgrtr loggers in ajsc -->
-  <logger name="org.onap.dmaap.service" level="TRACE" />
-  <logger name="org.onap.dmaap" level="TRACE" />
-
-
-  <!-- Spring related loggers -->
-  <logger name="org.springframework" level="TRACE" additivity="false"/>
-  <logger name="org.springframework.beans" level="TRACE" additivity="false"/>
-  <logger name="org.springframework.web" level="TRACE" additivity="false" />
-  <logger name="com.blog.spring.jms" level="TRACE" additivity="false" />
-
-  <!-- AJSC Services (bootstrap services) -->
-  <logger name="ajsc" level="TRACE" additivity="false"/>
-  <logger name="ajsc.RouteMgmtService" level="TRACE" additivity="false"/>
-  <logger name="ajsc.ComputeService" level="TRACE" additivity="false" />
-  <logger name="ajsc.VandelayService" level="TRACE" additivity="false"/>
-  <logger name="ajsc.FilePersistenceService" level="TRACE" additivity="false"/>
-  <logger name="ajsc.UserDefinedJarService" level="TRACE" additivity="false" />
-  <logger name="ajsc.UserDefinedBeansDefService" level="TRACE" additivity="false" />
-  <logger name="ajsc.LoggingConfigurationService" level="TRACE" additivity="false" />
-
-  <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet
-    logging) -->
-  <logger name="ajsc.utils" level="TRACE" additivity="false"/>
-  <logger name="ajsc.utils.DME2Helper" level="TRACE" additivity="false" />
-  <logger name="ajsc.filters" level="TRACE" additivity="false" />
-  <logger name="ajsc.beans.interceptors" level="TRACE" additivity="false" />
-  <logger name="ajsc.restlet" level="TRACE" additivity="false" />
-  <logger name="ajsc.servlet" level="TRACE" additivity="false" />
-  <logger name="com.att" level="TRACE" additivity="false" />
-  <logger name="com.att.ajsc.csi.logging" level="TRACE" additivity="false" />
-  <logger name="com.att.ajsc.filemonitor" level="TRACE" additivity="false"/>
-
-  <logger name="com.att.nsa.dmaap.util" level="TRACE" additivity="false"/>
-  <logger name="com.att.cadi.filter" level="TRACE" additivity="false" />
-
-
-  <!-- Other Loggers that may help troubleshoot -->
-  <logger name="net.sf" level="TRACE" additivity="false" />
-  <logger name="org.apache.commons.httpclient" level="TRACE" additivity="false"/>
-  <logger name="org.apache.commons" level="TRACE" additivity="false" />
-  <logger name="org.apache.coyote" level="TRACE" additivity="false"/>
-  <logger name="org.apache.jasper" level="TRACE" additivity="false"/>
-
-  <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.
-    May aid in troubleshooting) -->
-  <logger name="org.apache.camel" level="TRACE" additivity="false" />
-  <logger name="org.apache.cxf" level="TRACE" additivity="false" />
-  <logger name="org.apache.camel.processor.interceptor" level="TRACE" additivity="false"/>
-  <logger name="org.apache.cxf.jaxrs.interceptor" level="TRACE" additivity="false" />
-  <logger name="org.apache.cxf.service" level="TRACE" additivity="false" />
-  <logger name="org.restlet" level="TRACE" additivity="false" />
-  <logger name="org.apache.camel.component.restlet" level="TRACE" additivity="false" />
-  <logger name="org.apache.kafka" level="TRACE" additivity="false" />
-  <logger name="org.apache.zookeeper" level="TRACE" additivity="false" />
-  <logger name="org.I0Itec.zkclient" level="TRACE" additivity="false" />
-
-  <!-- logback internals logging -->
-  <logger name="ch.qos.logback.classic" level="TRACE" additivity="false"/>
-  <logger name="ch.qos.logback.core" level="TRACE" additivity="false" />
-
-  <!-- logback jms appenders & loggers definition starts here -->
-  <!-- logback jms appenders & loggers definition starts here -->
-  <appender name="auditLogs" class="ch.qos.logback.core.ConsoleAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-    </filter>
-    <encoder>
-      <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-    </encoder>
-  </appender>
-  <appender name="perfLogs" class="ch.qos.logback.core.ConsoleAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-    </filter>
-    <encoder>
-      <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-    </encoder>
-  </appender>
-  <appender name="ASYNC-audit" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <discardingThreshold>0</discardingThreshold>
-    <appender-ref ref="Audit-Record-Queue" />
-  </appender>
-
-  <logger name="AuditRecord" level="TRACE" additivity="FALSE">
-    <appender-ref ref="STDOUT" />
-  </logger>
-  <logger name="AuditRecord_DirectCall" level="TRACE" additivity="FALSE">
-    <appender-ref ref="STDOUT" />
-  </logger>
-  <appender name="ASYNC-perf" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <discardingThreshold>0</discardingThreshold>
-    <appender-ref ref="Performance-Tracker-Queue" />
-  </appender>
-  <logger name="PerfTrackerRecord" level="TRACE" additivity="FALSE">
-    <appender-ref ref="ASYNC-perf" />
-    <appender-ref ref="perfLogs" />
-  </logger>
-  <!-- logback jms appenders & loggers definition ends here -->
-
-  <root level="TRACE">
-    <appender-ref ref="DEBUG" />
-    <appender-ref ref="ERROR" />
-    <appender-ref ref="INFO" />
-    <appender-ref ref="STDOUT" />
-  </root>
-
-</configuration>
diff --git a/kubernetes/dmaap/components/message-router/templates/configmap.yaml b/kubernetes/dmaap/components/message-router/templates/configmap.yaml
deleted file mode 100644
index 3f786ad950..0000000000
--- a/kubernetes/dmaap/components/message-router/templates/configmap.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-{{/*
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# 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: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-msgrtrapi-prop-configmap
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/dmaap/MsgRtrApi.properties").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-logback-xml-configmap
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/dmaap/logback.xml").AsConfig . | indent 2 }}
-
diff --git a/kubernetes/dmaap/components/message-router/templates/ingress.yaml b/kubernetes/dmaap/components/message-router/templates/ingress.yaml
deleted file mode 100644
index a90bf83c07..0000000000
--- a/kubernetes/dmaap/components/message-router/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/message-router/templates/service.yaml b/kubernetes/dmaap/components/message-router/templates/service.yaml
deleted file mode 100644
index 8d13879023..0000000000
--- a/kubernetes/dmaap/components/message-router/templates/service.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{/*
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-#
-# 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/message-router/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
deleted file mode 100644
index ede6cb025e..0000000000
--- a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
+++ /dev/null
@@ -1,156 +0,0 @@
-{{/*
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021-2022 Nordix Foundation
-# Modifications Copyright © 2023 DTAG
-#
-# 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: StatefulSet
-metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
-spec:
-  selector: {{- include "common.selectors" . | nindent 4 }}
-  serviceName: {{ include "common.servicename" . }}
-  replicas: 1
-  template:
-    metadata: {{- include "common.templateMetadata" . | nindent 6 }}
-    spec:
-      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:
-            tcpSocket:
-              port: {{ .Values.liveness.port }}
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.liveness.periodSeconds }}
-            timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
-            successThreshold: {{ .Values.liveness.successThreshold }}
-            failureThreshold: {{ .Values.liveness.failureThreshold }}
-          {{ end }}
-          readinessProbe:
-            tcpSocket:
-              port: {{ .Values.readiness.port }}
-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.readiness.periodSeconds }}
-            timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
-            successThreshold: {{ .Values.readiness.successThreshold }}
-            failureThreshold: {{ .Values.readiness.failureThreshold }}
-          startupProbe:
-            tcpSocket:
-                port: {{ .Values.startup.port }}
-            initialDelaySeconds: {{ .Values.startup.initialDelaySeconds }}
-            periodSeconds: {{ .Values.startup.periodSeconds }}
-            timeoutSeconds: {{ .Values.startup.timeoutSeconds }}
-            successThreshold: {{ .Values.startup.successThreshold }}
-            failureThreshold: {{ .Values.startup.failureThreshold }}
-          env:
-          - name: JAASLOGIN
-            valueFrom:
-              secretKeyRef:
-                name: strimzi-kafka-admin
-                key: sasl.jaas.config
-          - name: SASLMECH
-            value: scram-sha-512
-          - name: enableCadi
-            value: "true"
-          - name: useZkTopicStore
-            value: "false"
-          volumeMounts:
-            - mountPath: /appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties
-              subPath: MsgRtrApi.properties
-              name: appprops
-            - mountPath: /appl/dmaapMR1/bundleconfig/etc/logback.xml
-              subPath: logback.xml
-              name: logback
-          resources: {{ include "common.resources" . | nindent 12 }}
-        - name: {{ .Values.zkTunnelService.name }}
-          image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.zkTunnelService.image }}
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          command:
-            - /opt/stunnel/stunnel_run.sh
-          ports:
-            - containerPort: {{ .Values.zkTunnelService.internalPort }}
-              name: {{ .Values.zkTunnelService.portName }}
-              protocol: {{ .Values.zkTunnelService.protocol }}
-          env:
-            - name: LOG_LEVEL
-              value: {{ .Values.zkTunnelService.logLevel }}
-            - name: STRIMZI_ZOOKEEPER_CONNECT
-              value: '{{ include "common.release" . }}-strimzi-zookeeper-client:{{ .Values.zkTunnelService.internalPort }}'
-          livenessProbe:
-            exec:
-              command:
-                - /opt/stunnel/stunnel_healthcheck.sh
-                - '{{ .Values.zkTunnelService.internalPort }}'
-            failureThreshold: 3
-            initialDelaySeconds: 15
-            periodSeconds: 10
-            successThreshold: 1
-            timeoutSeconds: 5
-          readinessProbe:
-            exec:
-              command:
-                - /opt/stunnel/stunnel_healthcheck.sh
-                - '{{ .Values.zkTunnelService.internalPort }}'
-            failureThreshold: 3
-            initialDelaySeconds: 15
-            periodSeconds: 10
-            successThreshold: 1
-            timeoutSeconds: 5
-          volumeMounts:
-            - mountPath: /etc/cluster-operator-certs/
-              name: cluster-operator-certs
-            - mountPath: /etc/cluster-ca-certs/
-              name: cluster-ca-certs
-      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
-      volumes:
-        - name: appprops
-          configMap:
-            name: {{ include "common.fullname" . }}-msgrtrapi-prop-configmap
-        - name: logback
-          configMap:
-            name: {{ include "common.fullname" . }}-logback-xml-configmap
-        - name: cluster-operator-certs
-          secret:
-            defaultMode: 288
-            secretName: {{ include "common.release" . }}-strimzi-cluster-operator-certs
-        - name: cluster-ca-certs
-          secret:
-            defaultMode: 288
-            secretName: {{ include "common.release" . }}-strimzi-cluster-ca-cert
-      {{- include "common.imagePullSecrets" . | nindent 6 }}
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: {{ include "common.fullname" . }}-zk-network-policy
-  namespace: {{ include "common.namespace" . }}
-spec:
-  podSelector:
-    matchLabels:
-      strimzi.io/name: {{ include "common.release" . }}-strimzi-zookeeper
-  ingress:
-  - from:
-    - podSelector:
-        matchLabels:
-          app.kubernetes.io/name: {{ include "common.name" . }}
-    ports:
-    - port: {{ .Values.zkTunnelService.internalPort }}
-      protocol: {{ .Values.zkTunnelService.protocol }}
-  policyTypes:
-  - Ingress
diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
deleted file mode 100644
index ab6a31ee2e..0000000000
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021-2022 Nordix Foundation
-# Modifications Copyright © 2023 DTAG
-#
-# 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: {}
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-# application image
-image: onap/dmaap/dmaap-mr:1.4.4
-pullPolicy: Always
-
-#Strimzi zookeeper_tunnel config
-zkTunnelService:
-    type: ClusterIP
-    name: zk-tunnel-svc
-    portName: tcp-zk-tunnel
-    protocol: TCP
-    internalPort: 2181
-    logLevel: debug
-    image: scholzj/zoo-entrance:latest
-
-nodeSelector: {}
-
-affinity: {}
-
-containerPort: &svc_port 3904
-
-service:
-  type: ClusterIP
-  name: message-router
-  ports:
-    - name: api
-      port: *svc_port
-      port_protocol: http
-
-ingress:
-  enabled: false
-  service:
-    - baseaddr: "dmaap-mr-api"
-      name: "message-router"
-      port: *svc_port
-  config:
-    ssl: "redirect"
-
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 10
-  periodSeconds: 30
-  timeoutSeconds: 15
-  successThreshold: 1
-  failureThreshold: 3
-  # 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
-  timeoutSeconds: 1
-  successThreshold: 1
-  failureThreshold: 3
-  port: *svc_port
-
-# periodSeconds is set longer to avoid DMaaP 429 error
-startup:
-  initialDelaySeconds: 90
-  periodSeconds: 30
-  timeoutSeconds: 15
-  successThreshold: 1
-  failureThreshold: 70
-  port: *svc_port
-
-# Resource Limit flavor -By Default using small
-flavor: small
-# Segregation for Different environment (Small and Large)
-resources:
-  small:
-    limits:
-      cpu: "2"
-      memory: "4Gi"
-    requests:
-      cpu: "1"
-      memory: "2Gi"
-  large:
-    limits:
-      cpu: "4"
-      memory: "8Gi"
-    requests:
-      cpu: "2"
-      memory: "4Gi"
-  unlimited: {}
-
-#Pods Service Account
-serviceAccount:
-  nameOverride: message-router
-  roles:
-    - read