AAI HELM code transfer

- Remove kubernetes/aai code from OOM.
- Add oom/aai as submodule of OOM in kubernetes/aai
location.

Change-Id: I7741a0cd4b0ecef174569c9450b09f2f7c211f44
Issue-ID: CIMAN-250
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

23 files changed, 0 insertions, 855 deletions

diff --git a/kubernetes/aai/charts/aai-spike/Chart.yaml b/kubernetes/aai/charts/aai-spike/Chart.yaml
deleted file mode 100644
index 587b84c537..0000000000
--- a/kubernetes/aai/charts/aai-spike/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright © 2018 Amdocs, 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.
-
-apiVersion: v1
-description: ONAP AAI Spike microservice
-name: aai-spike
-version: 4.0.0
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-spike/requirements.yaml b/kubernetes/aai/charts/aai-spike/requirements.yaml
deleted file mode 100644
index 8915b751c5..0000000000
--- a/kubernetes/aai/charts/aai-spike/requirements.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright © 2018 Amdocs, 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.
-
-dependencies:
-  - name: common
-    version: ~4.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'
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/auth/client-cert.p12 b/kubernetes/aai/charts/aai-spike/resources/config/auth/client-cert.p12
deleted file mode 100644
index d9fe86e4ec..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/auth/client-cert.p12
+++ /dev/null
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/auth/tomcat_keystore b/kubernetes/aai/charts/aai-spike/resources/config/auth/tomcat_keystore
deleted file mode 100644
index 025f3c49da..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/auth/tomcat_keystore
+++ /dev/null
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/edgeprops-ingest.properties b/kubernetes/aai/charts/aai-spike/resources/config/edgeprops-ingest.properties
deleted file mode 100644
index b0a315041d..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/edgeprops-ingest.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# org.onap.aai
-# ================================================================================
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
-# Copyright © 2018 Amdocs
-# ================================================================================
-# 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=========================================================
-#
-
-# DB Edge Property files are copied here:
-edgePropsDir=/opt/app/spike/config/model/edge_props
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/logback.xml b/kubernetes/aai/charts/aai-spike/resources/config/logback.xml
deleted file mode 100644
index e40ba13d04..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/logback.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<!--
-    ============LICENSE_START=======================================================
-    org.onap.aai
-    ================================================================================
-    Copyright © 2018 AT&T Intellectual Property. All rights reserved.
-    Copyright © 2018 Amdocs
-    ================================================================================
-    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="false">
-  <!--<jmxConfigurator /> -->
-  <!-- directory path for all other type logs -->
-
-  <property name="logDir"  value="/var/log/onap" />
-
-  <!--  specify the component name
-       <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
-  <property name="componentName" value="AAI-SPK" />
-
-  <!--  default eelf log file names -->
-  <property name="generalLogName" value="error" />
-  <property name="metricsLogName" value="metrics" />
-  <property name="auditLogName" value="audit" />
-  <property name="debugLogName" value="debug" />
-
-  <property name="errorLogPattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|Spike|%mdc{PartnerName}|%logger||%.-5level|%msg%n" />
-  <property name="auditMetricPattern" value="%m%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>${errorLogPattern}</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.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip
-      </fileNamePattern>
-      <maxHistory>60</maxHistory>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorLogPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
-    <!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>INFO</level>
-    </filter>
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELF" />
-  </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.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip
-      </fileNamePattern>
-      <maxHistory>60</maxHistory>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${auditMetricPattern}</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.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip
-      </fileNamePattern>
-      <maxHistory>60</maxHistory>
-    </rollingPolicy>
-    <encoder>
-      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} -
-           %msg%n"</pattern> -->
-      <pattern>${auditMetricPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFMetrics"/>
-  </appender>
-
-  <appender name="EELFDebug"
-            class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${debugLogName}.log</file>
-    <rollingPolicy
-        class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip
-      </fileNamePattern>
-      <maxHistory>60</maxHistory>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorLogPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFDebug" />
-    <includeCallerData>false</includeCallerData>
-  </appender>
-
-  <!-- ============================================================================ -->
-  <!--  EELF loggers -->
-  <!-- ============================================================================ -->
-  <logger name="com.att.eelf" level="info" additivity="false">
-    <appender-ref ref="asyncEELF" />
-    <appender-ref ref="asyncEELFDebug" />
-  </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>
-
-  <!-- Spring related loggers -->
-  <logger name="org.springframework" level="WARN" />
-  <logger name="org.springframework.beans" level="WARN" />
-  <logger name="org.springframework.web" level="WARN" />
-  <logger name="com.blog.spring.jms" level="WARN" />
-
-  <!-- Spike service loggers -->
-  <logger name="org.onap.aai.spike" level="INFO" />
-
-  <!-- Other Loggers that may help troubleshoot -->
-  <logger name="net.sf" level="WARN" />
-  <logger name="org.apache" level="WARN" />
-  <logger name="org.apache.commons.httpclient" level="WARN" />
-  <logger name="org.apache.commons" level="WARN" />
-  <logger name="org.apache.coyote" level="WARN" />
-  <logger name="org.apache.jasper" level="WARN" />
-
-  <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.
-       May aid in troubleshooting) -->
-  <logger name="org.apache.camel" level="WARN" />
-  <logger name="org.apache.cxf" level="WARN" />
-  <logger name="org.apache.camel.processor.interceptor" level="WARN" />
-  <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
-  <logger name="org.apache.cxf.service" level="WARN" />
-  <logger name="org.restlet" level="WARN" />
-  <logger name="org.apache.camel.component.restlet" level="WARN" />
-
-  <!-- logback internals logging -->
-  <logger name="ch.qos.logback.classic" level="WARN" />
-  <logger name="ch.qos.logback.core" level="WARN" />
-
-  <root>
-    <appender-ref ref="asyncEELF" />
-    <!-- <appender-ref ref="asyncEELFDebug" /> -->
-  </root>
-
-</configuration>
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v10.json b/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v10.json
deleted file mode 100644
index 7cbddae375..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v10.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "isParent":"java.lang.Boolean",
-  "isParent-REV":"java.lang.Boolean",
-  "usesResource":"java.lang.Boolean",
-  "usesResource-REV":"java.lang.Boolean",
-  "SVC-INFRA":"java.lang.Boolean",
-  "SVC-INFRA-REV":"java.lang.Boolean",
-  "hasDelTarget":"java.lang.Boolean",
-  "hasDelTarget-REV":"java.lang.Boolean"
-}
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v11.json b/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v11.json
deleted file mode 100644
index 8d00636d27..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v11.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-        "contains-other-v": "java.lang.String",
-        "delete-other-v": "java.lang.String",
-        "SVC-INFRA": "java.lang.String",
-        "prevent-delete": "java.lang.String"
-}
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v12.json b/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v12.json
deleted file mode 100644
index 8d00636d27..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v12.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-        "contains-other-v": "java.lang.String",
-        "delete-other-v": "java.lang.String",
-        "SVC-INFRA": "java.lang.String",
-        "prevent-delete": "java.lang.String"
-}
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v13.json b/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v13.json
deleted file mode 100644
index 8d00636d27..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v13.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-        "contains-other-v": "java.lang.String",
-        "delete-other-v": "java.lang.String",
-        "SVC-INFRA": "java.lang.String",
-        "prevent-delete": "java.lang.String"
-}
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v14.json b/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v14.json
deleted file mode 100644
index 8d00636d27..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v14.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-        "contains-other-v": "java.lang.String",
-        "delete-other-v": "java.lang.String",
-        "SVC-INFRA": "java.lang.String",
-        "prevent-delete": "java.lang.String"
-}
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v15.json b/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v15.json
deleted file mode 100644
index 8d00636d27..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v15.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-        "contains-other-v": "java.lang.String",
-        "delete-other-v": "java.lang.String",
-        "SVC-INFRA": "java.lang.String",
-        "prevent-delete": "java.lang.String"
-}
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v7.json b/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v7.json
deleted file mode 100644
index 7cbddae375..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v7.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "isParent":"java.lang.Boolean",
-  "isParent-REV":"java.lang.Boolean",
-  "usesResource":"java.lang.Boolean",
-  "usesResource-REV":"java.lang.Boolean",
-  "SVC-INFRA":"java.lang.Boolean",
-  "SVC-INFRA-REV":"java.lang.Boolean",
-  "hasDelTarget":"java.lang.Boolean",
-  "hasDelTarget-REV":"java.lang.Boolean"
-}
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v8.json b/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v8.json
deleted file mode 100644
index 7cbddae375..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v8.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "isParent":"java.lang.Boolean",
-  "isParent-REV":"java.lang.Boolean",
-  "usesResource":"java.lang.Boolean",
-  "usesResource-REV":"java.lang.Boolean",
-  "SVC-INFRA":"java.lang.Boolean",
-  "SVC-INFRA-REV":"java.lang.Boolean",
-  "hasDelTarget":"java.lang.Boolean",
-  "hasDelTarget-REV":"java.lang.Boolean"
-}
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v9.json b/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v9.json
deleted file mode 100644
index 7cbddae375..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/model/edge_props/edge_properties_v9.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "isParent":"java.lang.Boolean",
-  "isParent-REV":"java.lang.Boolean",
-  "usesResource":"java.lang.Boolean",
-  "usesResource-REV":"java.lang.Boolean",
-  "SVC-INFRA":"java.lang.Boolean",
-  "SVC-INFRA-REV":"java.lang.Boolean",
-  "hasDelTarget":"java.lang.Boolean",
-  "hasDelTarget-REV":"java.lang.Boolean"
-}
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/schema-ingest.properties b/kubernetes/aai/charts/aai-spike/resources/config/schema-ingest.properties
deleted file mode 100644
index 15697615df..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/schema-ingest.properties
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# org.onap.aai
-# ================================================================================
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
-# Copyright © 2018 Amdocs
-# ================================================================================
-# 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=========================================================
-#
-
-#######################################
-# Schema Version Related Attributes
-#######################################
-schema.uri.base.path=/aai
-# Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v15
-# Specifies from which version should the depth parameter to default to zero
-schema.version.depth.start=v10
-# Specifies from which version should the related link be displayed in response payload
-schema.version.related.link.start=v10
-# Specifies from which version should the client see only the uri excluding host info
-# Before this version server base will also be included
-schema.version.app.root.start=v11
-# Specifies from which version should the namespace be changed
-schema.version.namespace.change.start=v11
-# Specifies from which version should the client start seeing the edge label in payload
-schema.version.edge.label.start=v12
-# Specifies the version that the application should default to
-schema.version.api.default=v15
-
-#######################################
-# Schema Location Related Attributes
-#######################################
-schema.configuration.location=NA
-schema.nodes.location=/opt/app/spike/bundleconfig/etc/onap/oxm
-schema.edges.location=/opt/app/spike/bundleconfig/etc/onap/dbedgerules
-
-###############################################################################
-# Schema Service Related Attributes
-###############################################################################
-# Specifies whether to use the schema service (schema-service) or local schema files (config)
-schema.translator.list=config
-
-schema.service.base.url=https://<host>:8452/aai/schema-service/v1/
-schema.service.nodes.endpoint=nodes?version=
-schema.service.edges.endpoint=edgerules?version=
-schema.service.versions.endpoint=versions
-
-#Default rest client is the two-way-ssl
-schema.service.client=two-way-ssl
-#Replace the below with the A&AI client key store
-schema.service.ssl.key-store=${CONFIG_HOME}/auth/client-cert.p12
-#Replace the below with the A&AI tomcat trust store
-schema.service.ssl.trust-store=${CONFIG_HOME}/auth/tomcat_keystore
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml b/kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml
deleted file mode 100644
index 50be8cb0f8..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--
-    ============LICENSE_START=======================================================
-    org.onap.aai
-    ================================================================================
-    Copyright © 2018 AT&T Intellectual Property. All rights reserved.
-    Copyright © 2018 Amdocs
-    ================================================================================
-    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=========================================================
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
-
-   <bean id="eventConsumer" class="org.onap.aai.event.client.DMaaPEventConsumer">
-      <constructor-arg name="host" value="message-router.{{.Release.Namespace}}:{{.Values.event.port.dmaap}}" />
-      <constructor-arg name="topic" value="{{.Values.event.consumer.topic}}" />
-      <constructor-arg name="username" value="" />
-      <constructor-arg name="password" value="" />
-      <constructor-arg name="consumerGroup" value="spike" />
-      <constructor-arg name="consumerId" value="spike" />
-      <constructor-arg name="timeoutMs" value="1000" />
-      <constructor-arg name="messageLimit" value="100" />
-      <constructor-arg name="transportType" value="HTTPAUTH" />
-      <constructor-arg name="protocol" value="{{.Values.event.protocol}}" />
-      <constructor-arg name="filter"><null /></constructor-arg>
-   </bean>
-
-    <bean id="eventPublisher" class="org.onap.aai.event.client.DMaaPEventPublisher" >
-        <constructor-arg name="host" value="message-router.{{.Release.Namespace}}:{{.Values.event.port.dmaap}}" />
-        <constructor-arg name="topic" value="{{.Values.event.publisher.topic}}" />
-        <constructor-arg name="username" value="" />
-        <constructor-arg name="password" value="" />
-        <constructor-arg name="maxBatchSize" value="100" />
-        <constructor-arg name="maxAgeMs" value="250" />
-        <constructor-arg name="delayBetweenBatchesMs" value="50" />
-        <constructor-arg name="transportType" value="HTTPAUTH" />
-        <constructor-arg name="protocol" value="{{.Values.event.protocol}}" />
-        <constructor-arg name="contentType" value="application/json" />
-    </bean>
-
-   <bean id="spikeService" class="org.onap.aai.spike.service.SpikeService" init-method="startup">
-      <constructor-arg ref="eventConsumer" />
-      <constructor-arg ref="eventPublisher" />
-   </bean>
-
-</beans>
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/spike.properties b/kubernetes/aai/charts/aai-spike/resources/config/spike.properties
deleted file mode 100644
index c3ba4a3d5f..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/spike.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# org.onap.aai
-# ================================================================================
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
-# Copyright © 2018 Amdocs
-# ================================================================================
-# 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=========================================================
-#
-
-# Spike configuration
-
-spike.event.poll.interval=30000
-spike.event.offset.period= 10000
-spike.event.queue.capacity=10000
-spike.event.queue.delay=10000
-spike.props.reserved=source-of-truth,last-mod-source-of-truth,aai-created-ts,aai-last-mod-ts
diff --git a/kubernetes/aai/charts/aai-spike/templates/configmap.yaml b/kubernetes/aai/charts/aai-spike/templates/configmap.yaml
deleted file mode 100644
index ebd4fb0c66..0000000000
--- a/kubernetes/aai/charts/aai-spike/templates/configmap.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright © 2018 Amdocs, 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.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-configmap
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-edge-props-configmap
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/model/edge_props/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/aai/charts/aai-spike/templates/deployment.yaml b/kubernetes/aai/charts/aai-spike/templates/deployment.yaml
deleted file mode 100644
index c962f1df2b..0000000000
--- a/kubernetes/aai/charts/aai-spike/templates/deployment.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright © 2018 Amdocs, 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.
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
-    spec:
-      initContainers:
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - message-router-kafka
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        name: {{ include "common.name" . }}-readiness
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          ports:
-          - containerPort: {{ .Values.service.internalPort }}
-          # disable liveness probe when breakpoints set in debugger
-          # so K8s doesn't restart unresponsive container
-          {{ if .Values.liveness.enabled }}
-          livenessProbe:
-            tcpSocket:
-              port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.liveness.periodSeconds }}
-          {{ end }}
-          readinessProbe:
-            tcpSocket:
-              port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.readiness.periodSeconds }}
-          env:
-            - name: CONFIG_HOME
-              value: /opt/app/spike/config
-            - name: KEY_STORE_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "common.fullname" . }}-pass
-                  key: KEY_STORE_PASSWORD
-            - name: KEY_MANAGER_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "common.fullname" . }}-pass
-                  key: KEY_MANAGER_PASSWORD
-            - name: SERVICE_BEANS
-              value: /opt/app/spike/dynamic/conf
-          volumeMounts:
-          - mountPath: /etc/localtime
-            name: localtime
-            readOnly: true
-          - mountPath: /opt/app/spike/config/auth
-            name: {{ include "common.fullname" . }}-secrets
-          - mountPath: /opt/app/spike/dynamic/conf/spike-beans.xml
-            name: {{ include "common.fullname" . }}-config
-            subPath: spike-beans.xml
-          - mountPath: /opt/app/spike/config/spike.properties
-            subPath: spike.properties
-            name: {{ include "common.fullname" . }}-config
-          - mountPath: /opt/app/spike/config/schema-ingest.properties
-            subPath: schema-ingest.properties
-            name: {{ include "common.fullname" . }}-config
-          - mountPath: /opt/app/spike/config/edgeprops-ingest.properties
-            subPath: edgeprops-ingest.properties
-            name: {{ include "common.fullname" . }}-config
-          - mountPath: /opt/app/spike/config/model/edge_props
-            name: {{ include "common.fullname" . }}-edge-props-config
-          - mountPath: /opt/app/spike/bundleconfig/etc/logback.xml
-            name: {{ include "common.fullname" . }}-config
-            subPath: logback.xml
-          - mountPath: /var/log/onap
-            name: {{ include "common.fullname" . }}-logs
-          resources:
-{{ include "common.resources" . }}
-      {{- if .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-      {{- end -}}
-      {{- if .Values.affinity }}
-      affinity:
-{{ toYaml .Values.affinity | indent 8 }}
-      {{- end }}
-
-        # side car containers
-        - name: filebeat-onap
-          image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          volumeMounts:
-          - mountPath: /usr/share/filebeat/filebeat.yml
-            subPath: filebeat.yml
-            name: filebeat-conf
-          - mountPath: /var/log/onap
-            name: {{ include "common.fullname" . }}-logs
-          - mountPath: /usr/share/filebeat/data
-            name: aai-filebeat
-          resources:
-{{ include "common.resources" . }}
-
-      volumes:
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-        - name: {{ include "common.fullname" . }}-secrets
-          secret:
-            secretName: {{ include "common.fullname" . }}-spike-secrets
-        - name: {{ include "common.fullname" . }}-config
-          configMap:
-            name: {{ include "common.fullname" . }}-configmap
-            items:
-            - key: spike.properties
-              path: spike.properties
-            - key: spike-beans.xml
-              path: spike-beans.xml
-            - key: schema-ingest.properties
-              path: schema-ingest.properties
-            - key: edgeprops-ingest.properties
-              path: edgeprops-ingest.properties
-            - key: logback.xml
-              path: logback.xml
-        - name: {{ include "common.fullname" . }}-edge-props-config
-          configMap:
-            name: {{ include "common.fullname" . }}-edge-props-configmap
-        - name: filebeat-conf
-          configMap:
-            name: aai-filebeat
-        - name: {{ include "common.fullname" . }}-logs
-          emptyDir: {}
-        - name: aai-filebeat
-          emptyDir: {}
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aai/charts/aai-spike/templates/secrets.yaml b/kubernetes/aai/charts/aai-spike/templates/secrets.yaml
deleted file mode 100644
index 510805d8cd..0000000000
--- a/kubernetes/aai/charts/aai-spike/templates/secrets.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright © 2018 Amdocs, 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.
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.fullname" . }}-spike-secrets
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-type: Opaque
-data:
-{{ tpl (.Files.Glob "resources/config/auth/*").AsSecrets . | indent 2 }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.fullname" . }}-pass
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-type: Opaque
-data:
-  KEY_STORE_PASSWORD: {{ .Values.config.keyStorePassword | b64enc | quote }}
-  KEY_MANAGER_PASSWORD: {{ .Values.config.keyManagerPassword | b64enc | quote }}
diff --git a/kubernetes/aai/charts/aai-spike/templates/service.yaml b/kubernetes/aai/charts/aai-spike/templates/service.yaml
deleted file mode 100644
index 745c73b0e1..0000000000
--- a/kubernetes/aai/charts/aai-spike/templates/service.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright © 2018 Amdocs, 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.
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    {{if eq .Values.service.type "NodePort" -}}
-    - port: {{ .Values.service.internalPort}}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort}}
-      name: {{ .Values.service.portName }}
-    {{- else -}}
-    - port: {{ .Values.service.externalPort }}
-      targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.portName }}
-    {{- end}}
-  selector:
-    app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
diff --git a/kubernetes/aai/charts/aai-spike/values.yaml b/kubernetes/aai/charts/aai-spike/values.yaml
deleted file mode 100644
index fbe09f7d10..0000000000
--- a/kubernetes/aai/charts/aai-spike/values.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright © 2018 Amdocs, 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.
-
-#################################################################
-# Global configuration defaults.
-#################################################################
-global:
-  readinessImage: readiness-check:2.0.2
-  loggingImage: beats/filebeat:5.5.0
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-
-# application image
-image: onap/spike:1.4-STAGING-latest
-flavor: small
-# application configuration
-config:
-  keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
-  keyManagerPassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
-
-# default number of instances
-replicaCount: 1
-
-nodeSelector: {}
-
-affinity: {}
-
-# 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
-  enabled: false
-
-readiness:
-  initialDelaySeconds: 10
-  periodSeconds: 10
-
-service:
-  type: NodePort
-  portName: spike
-  externalPort: 9518
-  internalPort: 9518
-  nodePort: 39
-
-ingress:
-  enabled: false
-
-resources:
-  small:
-    limits:
-      cpu: 2
-      memory: 4Gi
-    requests:
-      cpu: 0.5
-      memory: 1Gi
-  large:
-    limits:
-      cpu: 4
-      memory: 8Gi
-    requests:
-      cpu: 1
-      memory: 1536Mi
-  unlimited: {}
-
-# XML bean configuration
-event:
-  port:
-    dmaap: 3905
-  protocol: https
-  consumer:
-    topic: champRawEvents
-  publisher:
-    topic: spikeEvents