Conform to helm standards

Change-Id: I6cda4dbc168ae6cb110deca5596e5d96f517e7fe
Issue-ID: OOM-790
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>

11 files changed, 0 insertions, 381 deletions

diff --git a/kubernetes/aai/charts/champ/Chart.yaml b/kubernetes/aai/charts/champ/Chart.yaml
deleted file mode 100644
index a4ee888fce..0000000000
--- a/kubernetes/aai/charts/champ/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: Champ microservice
-name: champ
-version: 2.0.0
diff --git a/kubernetes/aai/charts/champ/requirements.yaml b/kubernetes/aai/charts/champ/requirements.yaml
deleted file mode 100644
index 9552dfd9e0..0000000000
--- a/kubernetes/aai/charts/champ/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: ~2.0.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/champ/resources/config/appconfig/auth/champ_policy.json b/kubernetes/aai/charts/champ/resources/config/appconfig/auth/champ_policy.json
deleted file mode 100644
index ee04a714be..0000000000
--- a/kubernetes/aai/charts/champ/resources/config/appconfig/auth/champ_policy.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"roles": [
-		{
-			"name": "admin",
-			"functions": [
-				{
-					"name": "search", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" } ]
-				}
-			],
-
-			"users": [
-				{
-					"username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA"
-				}
-			]
-		}
-	]
-}
-
diff --git a/kubernetes/aai/charts/champ/resources/config/appconfig/auth/tomcat_keystore b/kubernetes/aai/charts/champ/resources/config/appconfig/auth/tomcat_keystore
deleted file mode 100644
index 9eec841aa2..0000000000
--- a/kubernetes/aai/charts/champ/resources/config/appconfig/auth/tomcat_keystore
+++ /dev/null
diff --git a/kubernetes/aai/charts/champ/resources/config/appconfig/champ-api.properties b/kubernetes/aai/charts/champ/resources/config/appconfig/champ-api.properties
deleted file mode 100644
index 3b90c5522f..0000000000
--- a/kubernetes/aai/charts/champ/resources/config/appconfig/champ-api.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-keyName=aai-uuid
-sourceOfTruthName=source-of-truth
-createdTsName=aai-created-ts
-lastModTsName=aai-last-mod-ts
-collectionPropertiesKey=properties
-
diff --git a/kubernetes/aai/charts/champ/resources/config/dynamic/conf/champ-beans.xml b/kubernetes/aai/charts/champ/resources/config/dynamic/conf/champ-beans.xml
deleted file mode 100644
index cdf3aada40..0000000000
--- a/kubernetes/aai/charts/champ/resources/config/dynamic/conf/champ-beans.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<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
-       ">
-
-    <!-- Event publisher to pass to the Champ library for logging raw graph
-         events (Kafka implementation). -->
-    <bean id="champEventPublisher" class="org.onap.aai.event.client.KafkaEventPublisher" >
-        <constructor-arg name="hosts" value="global-kafka.{{.Release.Namespace}}:9092" />
-        <constructor-arg name="topic" value="champRawEvents" />
-    </bean>
-
-    <!-- Graph Implementation Configuration-->
-    <util:map id="props" map-class="java.util.HashMap" key-type="java.lang.String" value-type="java.lang.Object">
-        <entry key="champcore.event.stream.buffer.capacity" value="50" value-type="java.lang.Integer"/>
-        <entry key="champcore.event.stream.publisher-pool-size" value="10" value-type="java.lang.Integer"/>
-        <entry key="champcore.event.stream.publisher" value-ref="champEventPublisher"/>
-
-        <entry key="graph.name" value="aaigraph.dev"/>
-        <entry key="storage.backend" value="hbase"/>
-        <entry key="storage.hostname" value="hbase.{{.Release.Namespace}}"/>
-
-        <!-- Hbase Config -->
-        <entry key="storage.hbase.ext.hbase.zookeeper.property.clientPort" value="2181"/>
-        <entry key="storage.hbase.ext.zookeeper.znode.parent" value="/hbase"/>
-    </util:map>
-
-    <!-- Janus Implementation -->
-    <bean id="graphBuilder" class="org.onap.aai.champjanus.graph.impl.JanusChampGraphImpl$Builder">
-        <constructor-arg value="aaigraph.dev"/>
-        <constructor-arg ref="props" />
-    </bean>
-
-    <bean id="graphImpl" class="org.onap.aai.champjanus.graph.impl.JanusChampGraphImpl">
-        <constructor-arg ref="graphBuilder" />
-    </bean>
-
-    <bean id="champUUIDService" class="org.onap.champ.service.ChampUUIDService" >
-        <constructor-arg name="graphImpl" ref="graphImpl" />
-    </bean>
-
-    <bean id="cache" class="org.onap.champ.service.ChampTransactionCache" >
-        <constructor-arg name="txTimeOutInSec" value="600" />
-        <constructor-arg name="graphImpl" ref="graphImpl" />
-    </bean>
-
-    <bean id="champDataService" class="org.onap.champ.service.ChampDataService" >
-        <constructor-arg name="champUUIDService" ref="champUUIDService" />
-        <constructor-arg name="graphImpl" ref="graphImpl" />
-        <constructor-arg name="cache" ref="cache" />
-    </bean>
-
-    <bean id="champRestService" class="org.onap.champ.ChampRESTAPI" >
-        <constructor-arg name="champDataService" ref="champDataService" />
-        <constructor-arg name="champAsyncRequestProcessor"><null/></constructor-arg>
-    </bean>
-</beans>
diff --git a/kubernetes/aai/charts/champ/templates/configmap.yaml b/kubernetes/aai/charts/champ/templates/configmap.yaml
deleted file mode 100644
index 8f48f199f8..0000000000
--- a/kubernetes/aai/charts/champ/templates/configmap.yaml
+++ /dev/null
@@ -1,29 +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" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/appconfig/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-dynamic-configmap
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/dynamic/conf/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/aai/charts/champ/templates/deployment.yaml b/kubernetes/aai/charts/champ/templates/deployment.yaml
deleted file mode 100644
index 23314aeee4..0000000000
--- a/kubernetes/aai/charts/champ/templates/deployment.yaml
+++ /dev/null
@@ -1,107 +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:
-      containers:
-        - name: {{ include "common.name" . }}
-          image: "{{ .Values.global.repository | default .Values.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/champ-service/appconfig"
-            - name: GRAPHIMPL
-              value: "janus-deps"
-            - name: SERVICE_BEANS
-              value: "/opt/app/champ-service/dynamic/conf"
-          volumeMounts:
-          - mountPath: /etc/localtime
-            name: localtime
-            readOnly: true
-          - mountPath: /opt/app/champ-service/appconfig/champ-api.properties
-            name: {{ include "common.fullname" . }}-config
-            subPath: champ-api.properties
-          - mountPath: /opt/app/champ-service/appconfig/auth
-            name: {{ include "common.fullname" . }}-secrets
-          - mountPath: /opt/app/champ-service/dynamic/conf/champ-beans.xml
-            name: {{ include "common.fullname" . }}-dynamic-config
-            subPath: champ-beans.xml
-          - mountPath: /logs
-            name: {{ include "common.fullname" . }}-logs
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-        {{- if .Values.nodeSelector }}
-        nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 10 }}
-        {{- end -}}
-        {{- if .Values.affinity }}
-        affinity:
-{{ toYaml .Values.affinity | indent 10 }}
-        {{- end }}
-
-      volumes:
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-        - name: {{ include "common.fullname" . }}-config
-          configMap:
-            name: {{ include "common.fullname" . }}-configmap
-            items:
-            - key: champ-api.properties
-              path: champ-api.properties
-        - name: {{ include "common.fullname" . }}-secrets
-          secret:
-            secretName: {{ include "common.fullname" . }}-champ-secrets
-        - name: {{ include "common.fullname" . }}-dynamic-config
-          configMap:
-            name: {{ include "common.fullname" . }}-dynamic-configmap
-            items:
-            - key: champ-beans.xml
-              path: champ-beans.xml
-        - name: {{ include "common.fullname" . }}-logs
-          emptyDir: {}
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aai/charts/champ/templates/secrets.yaml b/kubernetes/aai/charts/champ/templates/secrets.yaml
deleted file mode 100644
index e939eb904b..0000000000
--- a/kubernetes/aai/charts/champ/templates/secrets.yaml
+++ /dev/null
@@ -1,22 +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" . }}-champ-secrets
-  namespace: {{ include "common.namespace" . }}
-type: Opaque
-data:
-{{ tpl (.Files.Glob "resources/config/appconfig/auth/*").AsSecrets . | indent 2 }}
diff --git a/kubernetes/aai/charts/champ/templates/service.yaml b/kubernetes/aai/charts/champ/templates/service.yaml
deleted file mode 100644
index 93b0fd1254..0000000000
--- a/kubernetes/aai/charts/champ/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.fullname" . }}
-  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.name }}
-    {{- else -}}
-    - port: {{ .Values.service.externalPort }}
-      targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.name }}
-    {{- end}}
-  selector:
-    app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
diff --git a/kubernetes/aai/charts/champ/values.yaml b/kubernetes/aai/charts/champ/values.yaml
deleted file mode 100644
index 91a1e52091..0000000000
--- a/kubernetes/aai/charts/champ/values.yaml
+++ /dev/null
@@ -1,58 +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:1.0.0
-  loggingImage: beats/filebeat:5.5.0
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-
-# application image
-image: onap/champ:1.2.0
-
-# 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
-  name: champ
-  externalPort: 78
-  internalPort: 9522
-  nodePort: 78
-
-ingress:
-  enabled: false
-
-resources: {}