Conform to helm standards

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

diff --git a/kubernetes/aai/charts/champ/Chart.yaml b/kubernetes/aai/charts/aai-champ/Chart.yaml
similarity index 91%
rename from kubernetes/aai/charts/champ/Chart.yaml
rename to kubernetes/aai/charts/aai-champ/Chart.yaml
index a4ee888..1704337 100644 (file)
--- a/kubernetes/aai/charts/champ/Chart.yaml
+++ b/kubernetes/aai/charts/aai-champ/Chart.yaml
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 apiVersion: v1
-description: Champ microservice
-name: champ
+description: ONAP AAI Champ microservice
+name: aai-champ
 version: 2.0.0

diff --git a/kubernetes/aai/charts/champ/requirements.yaml b/kubernetes/aai/charts/aai-champ/requirements.yaml
similarity index 100%
rename from kubernetes/aai/charts/champ/requirements.yaml
rename to kubernetes/aai/charts/aai-champ/requirements.yaml

diff --git a/kubernetes/aai/charts/champ/resources/config/appconfig/auth/champ_policy.json b/kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/champ_policy.json
similarity index 100%
rename from kubernetes/aai/charts/champ/resources/config/appconfig/auth/champ_policy.json
rename to kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/champ_policy.json

diff --git a/kubernetes/aai/charts/champ/resources/config/appconfig/auth/tomcat_keystore b/kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore
similarity index 100%
rename from kubernetes/aai/charts/champ/resources/config/appconfig/auth/tomcat_keystore
rename to kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore

diff --git a/kubernetes/aai/charts/champ/resources/config/appconfig/champ-api.properties b/kubernetes/aai/charts/aai-champ/resources/config/appconfig/champ-api.properties
similarity index 100%
rename from kubernetes/aai/charts/champ/resources/config/appconfig/champ-api.properties
rename to kubernetes/aai/charts/aai-champ/resources/config/appconfig/champ-api.properties

diff --git a/kubernetes/aai/charts/champ/resources/config/dynamic/conf/champ-beans.xml b/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
similarity index 97%
rename from kubernetes/aai/charts/champ/resources/config/dynamic/conf/champ-beans.xml
rename to kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
index cdf3aad..f97ac16 100644 (file)
--- a/kubernetes/aai/charts/champ/resources/config/dynamic/conf/champ-beans.xml
+++ b/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
@@ -23,7 +23,7 @@ xsi:schemaLocation="
 
         <entry key="graph.name" value="aaigraph.dev"/>
         <entry key="storage.backend" value="hbase"/>
-        <entry key="storage.hostname" value="hbase.{{.Release.Namespace}}"/>
+        <entry key="storage.hostname" value="aai-hbase.{{.Release.Namespace}}"/>
 
         <!-- Hbase Config -->
         <entry key="storage.hbase.ext.hbase.zookeeper.property.clientPort" value="2181"/>

diff --git a/kubernetes/aai/charts/champ/templates/configmap.yaml b/kubernetes/aai/charts/aai-champ/templates/configmap.yaml
similarity index 89%
rename from kubernetes/aai/charts/champ/templates/configmap.yaml
rename to kubernetes/aai/charts/aai-champ/templates/configmap.yaml
index 8f48f19..a085839 100644 (file)
--- a/kubernetes/aai/charts/champ/templates/configmap.yaml
+++ b/kubernetes/aai/charts/aai-champ/templates/configmap.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.fullname" . }}-configmap
+  name: {{ include "common.fullname" . }}
   namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/appconfig/*").AsConfig . | indent 2 }}
@@ -23,7 +23,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.fullname" . }}-dynamic-configmap
+  name: {{ include "common.fullname" . }}-dynamic
   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/aai-champ/templates/deployment.yaml
similarity index 87%
rename from kubernetes/aai/charts/champ/templates/deployment.yaml
rename to kubernetes/aai/charts/aai-champ/templates/deployment.yaml
index 23314ae..ccb9021 100644 (file)
--- a/kubernetes/aai/charts/champ/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
@@ -55,6 +55,16 @@ spec:
               value: "/opt/app/champ-service/appconfig"
             - name: GRAPHIMPL
               value: "janus-deps"
+            - 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/champ-service/dynamic/conf"
           volumeMounts:
@@ -88,16 +98,16 @@ spec:
             path: /etc/localtime
         - name: {{ include "common.fullname" . }}-config
           configMap:
-            name: {{ include "common.fullname" . }}-configmap
+            name: {{ include "common.fullname" . }}
             items:
             - key: champ-api.properties
               path: champ-api.properties
         - name: {{ include "common.fullname" . }}-secrets
           secret:
-            secretName: {{ include "common.fullname" . }}-champ-secrets
+            secretName: {{ include "common.fullname" . }}-champ
         - name: {{ include "common.fullname" . }}-dynamic-config
           configMap:
-            name: {{ include "common.fullname" . }}-dynamic-configmap
+            name: {{ include "common.fullname" . }}-dynamic
             items:
             - key: champ-beans.xml
               path: champ-beans.xml

diff --git a/kubernetes/aai/charts/champ/templates/secrets.yaml b/kubernetes/aai/charts/aai-champ/templates/secrets.yaml
similarity index 58%
rename from kubernetes/aai/charts/champ/templates/secrets.yaml
rename to kubernetes/aai/charts/aai-champ/templates/secrets.yaml
index e939eb9..c0e2559 100644 (file)
--- a/kubernetes/aai/charts/champ/templates/secrets.yaml
+++ b/kubernetes/aai/charts/aai-champ/templates/secrets.yaml
@@ -15,8 +15,24 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "common.fullname" . }}-champ-secrets
+  name: {{ include "common.fullname" . }}-champ
   namespace: {{ include "common.namespace" . }}
 type: Opaque
 data:
 {{ tpl (.Files.Glob "resources/config/appconfig/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/champ/templates/service.yaml b/kubernetes/aai/charts/aai-champ/templates/service.yaml
similarity index 100%
rename from kubernetes/aai/charts/champ/templates/service.yaml
rename to kubernetes/aai/charts/aai-champ/templates/service.yaml

diff --git a/kubernetes/aai/charts/champ/values.yaml b/kubernetes/aai/charts/aai-champ/values.yaml
similarity index 88%
rename from kubernetes/aai/charts/champ/values.yaml
rename to kubernetes/aai/charts/aai-champ/values.yaml
index 91a1e52..d5d9b39 100644 (file)
--- a/kubernetes/aai/charts/champ/values.yaml
+++ b/kubernetes/aai/charts/aai-champ/values.yaml
@@ -24,7 +24,12 @@ global:
 #################################################################
 
 # application image
-image: onap/champ:1.2.0
+image: onap/champ:1.2-STAGING-latest
+
+# application configuration
+config:
+  keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+  keyManagerPassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
 
 # default number of instances
 replicaCount: 1
@@ -48,7 +53,6 @@ readiness:
 service:
   type: NodePort
   name: champ
-  externalPort: 78
   internalPort: 9522
   nodePort: 78
 

diff --git a/kubernetes/aai/charts/gizmo/.helmignore b/kubernetes/aai/charts/aai-gizmo/.helmignore
similarity index 100%
rename from kubernetes/aai/charts/gizmo/.helmignore
rename to kubernetes/aai/charts/aai-gizmo/.helmignore

diff --git a/kubernetes/aai/charts/gizmo/Chart.yaml b/kubernetes/aai/charts/aai-gizmo/Chart.yaml
similarity index 95%
rename from kubernetes/aai/charts/gizmo/Chart.yaml
rename to kubernetes/aai/charts/aai-gizmo/Chart.yaml
index 4633b06..86f3643 100644 (file)
--- a/kubernetes/aai/charts/gizmo/Chart.yaml
+++ b/kubernetes/aai/charts/aai-gizmo/Chart.yaml
@@ -14,5 +14,5 @@
 
 apiVersion: v1
 description: Gizmo service
-name: gizmo
-version: 2.0.0
\ No newline at end of file
+name: aai-gizmo
+version: 2.0.0

diff --git a/kubernetes/aai/charts/gizmo/resources/config/README.txt b/kubernetes/aai/charts/aai-gizmo/resources/config/README.txt
similarity index 100%
rename from kubernetes/aai/charts/gizmo/resources/config/README.txt
rename to kubernetes/aai/charts/aai-gizmo/resources/config/README.txt

diff --git a/kubernetes/aai/charts/gizmo/resources/config/auth/champ-cert.p12 b/kubernetes/aai/charts/aai-gizmo/resources/config/auth/champ-cert.p12
similarity index 100%
rename from kubernetes/aai/charts/gizmo/resources/config/auth/champ-cert.p12
rename to kubernetes/aai/charts/aai-gizmo/resources/config/auth/champ-cert.p12

diff --git a/kubernetes/aai/charts/gizmo/resources/config/auth/crud_policy.json b/kubernetes/aai/charts/aai-gizmo/resources/config/auth/crud_policy.json
similarity index 100%
rename from kubernetes/aai/charts/gizmo/resources/config/auth/crud_policy.json
rename to kubernetes/aai/charts/aai-gizmo/resources/config/auth/crud_policy.json

diff --git a/kubernetes/aai/charts/gizmo/resources/config/auth/datarouter-cert.p12 b/kubernetes/aai/charts/aai-gizmo/resources/config/auth/datarouter-cert.p12
similarity index 100%
rename from kubernetes/aai/charts/gizmo/resources/config/auth/datarouter-cert.p12
rename to kubernetes/aai/charts/aai-gizmo/resources/config/auth/datarouter-cert.p12

diff --git a/kubernetes/aai/charts/gizmo/resources/config/auth/tomcat_keystore b/kubernetes/aai/charts/aai-gizmo/resources/config/auth/tomcat_keystore
similarity index 100%
rename from kubernetes/aai/charts/gizmo/resources/config/auth/tomcat_keystore
rename to kubernetes/aai/charts/aai-gizmo/resources/config/auth/tomcat_keystore

diff --git a/kubernetes/aai/charts/gizmo/resources/config/crud-api.properties b/kubernetes/aai/charts/aai-gizmo/resources/config/crud-api.properties
similarity index 100%
rename from kubernetes/aai/charts/gizmo/resources/config/crud-api.properties
rename to kubernetes/aai/charts/aai-gizmo/resources/config/crud-api.properties

diff --git a/kubernetes/aai/charts/gizmo/resources/config/crud-beans.xml b/kubernetes/aai/charts/aai-gizmo/resources/config/crud-beans.xml
similarity index 95%
rename from kubernetes/aai/charts/gizmo/resources/config/crud-beans.xml
rename to kubernetes/aai/charts/aai-gizmo/resources/config/crud-beans.xml
index 04f1210..a6cac62 100644 (file)
--- a/kubernetes/aai/charts/gizmo/resources/config/crud-beans.xml
+++ b/kubernetes/aai/charts/aai-gizmo/resources/config/crud-beans.xml
@@ -9,7 +9,7 @@
                 ">
 
      <bean id="champDao" class="org.onap.crud.dao.champ.ChampDao">
-         <constructor-arg name="champUrl" value="https://{{.Release.Name}}-champ.{{.Release.Namespace}}:9522/services/champ-service/v1/"/>
+         <constructor-arg name="champUrl" value="https://{{.Release.Name}}-aai-champ.{{.Release.Namespace}}:9522/services/champ-service/v1/"/>
          <constructor-arg name="certPassword" value="OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10"/>
      </bean>
 
@@ -32,4 +32,4 @@
          <constructor-arg name="graphDataService" ref="graphDataService" />
      </bean>
 
-</beans>
\ No newline at end of file
+</beans>

diff --git a/kubernetes/aai/charts/gizmo/resources/config/log/filebeat/filebeat.yml b/kubernetes/aai/charts/aai-gizmo/resources/config/log/filebeat/filebeat.yml
similarity index 100%
rename from kubernetes/aai/charts/gizmo/resources/config/log/filebeat/filebeat.yml
rename to kubernetes/aai/charts/aai-gizmo/resources/config/log/filebeat/filebeat.yml

diff --git a/kubernetes/aai/charts/gizmo/resources/config/log/logback.xml b/kubernetes/aai/charts/aai-gizmo/resources/config/log/logback.xml
similarity index 100%
rename from kubernetes/aai/charts/gizmo/resources/config/log/logback.xml
rename to kubernetes/aai/charts/aai-gizmo/resources/config/log/logback.xml

diff --git a/kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v11.json b/kubernetes/aai/charts/aai-gizmo/resources/config/model/edge_properties_v11.json
similarity index 100%
rename from kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v11.json
rename to kubernetes/aai/charts/aai-gizmo/resources/config/model/edge_properties_v11.json

diff --git a/kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v12.json b/kubernetes/aai/charts/aai-gizmo/resources/config/model/edge_properties_v12.json
similarity index 100%
rename from kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v12.json
rename to kubernetes/aai/charts/aai-gizmo/resources/config/model/edge_properties_v12.json

diff --git a/kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v13.json b/kubernetes/aai/charts/aai-gizmo/resources/config/model/edge_properties_v13.json
similarity index 100%
rename from kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v13.json
rename to kubernetes/aai/charts/aai-gizmo/resources/config/model/edge_properties_v13.json

diff --git a/kubernetes/aai/charts/gizmo/templates/NOTES.txt b/kubernetes/aai/charts/aai-gizmo/templates/NOTES.txt
similarity index 100%
rename from kubernetes/aai/charts/gizmo/templates/NOTES.txt
rename to kubernetes/aai/charts/aai-gizmo/templates/NOTES.txt

diff --git a/kubernetes/aai/charts/gizmo/templates/configmap.yaml b/kubernetes/aai/charts/aai-gizmo/templates/configmap.yaml
similarity index 100%
rename from kubernetes/aai/charts/gizmo/templates/configmap.yaml
rename to kubernetes/aai/charts/aai-gizmo/templates/configmap.yaml

diff --git a/kubernetes/aai/charts/gizmo/templates/deployment.yaml b/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml
similarity index 100%
rename from kubernetes/aai/charts/gizmo/templates/deployment.yaml
rename to kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml

diff --git a/kubernetes/aai/charts/gizmo/templates/secrets.yaml b/kubernetes/aai/charts/aai-gizmo/templates/secrets.yaml
similarity index 100%
rename from kubernetes/aai/charts/gizmo/templates/secrets.yaml
rename to kubernetes/aai/charts/aai-gizmo/templates/secrets.yaml

diff --git a/kubernetes/aai/charts/gizmo/templates/service.yaml b/kubernetes/aai/charts/aai-gizmo/templates/service.yaml
similarity index 100%
rename from kubernetes/aai/charts/gizmo/templates/service.yaml
rename to kubernetes/aai/charts/aai-gizmo/templates/service.yaml

diff --git a/kubernetes/aai/charts/gizmo/values.yaml b/kubernetes/aai/charts/aai-gizmo/values.yaml
similarity index 100%
rename from kubernetes/aai/charts/gizmo/values.yaml
rename to kubernetes/aai/charts/aai-gizmo/values.yaml