Conform to helm standards
Change-Id: I6cda4dbc168ae6cb110deca5596e5d96f517e7fe
Issue-ID: OOM-790
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
diff --git a/charts/gizmo/Chart.yaml b/charts/aai-champ/Chart.yaml
similarity index 91%
copy from charts/gizmo/Chart.yaml
copy to charts/aai-champ/Chart.yaml
index 4633b06..1704337 100644
--- a/charts/gizmo/Chart.yaml
+++ b/charts/aai-champ/Chart.yaml
@@ -13,6 +13,6 @@
# limitations under the License.
apiVersion: v1
-description: Gizmo service
-name: gizmo
-version: 2.0.0
\ No newline at end of file
+description: ONAP AAI Champ microservice
+name: aai-champ
+version: 2.0.0
diff --git a/charts/champ/requirements.yaml b/charts/aai-champ/requirements.yaml
similarity index 100%
rename from charts/champ/requirements.yaml
rename to charts/aai-champ/requirements.yaml
diff --git a/charts/champ/resources/config/appconfig/auth/champ_policy.json b/charts/aai-champ/resources/config/appconfig/auth/champ_policy.json
similarity index 100%
rename from charts/champ/resources/config/appconfig/auth/champ_policy.json
rename to charts/aai-champ/resources/config/appconfig/auth/champ_policy.json
diff --git a/charts/champ/resources/config/appconfig/auth/tomcat_keystore b/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore
similarity index 100%
rename from charts/champ/resources/config/appconfig/auth/tomcat_keystore
rename to charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore
Binary files differ
diff --git a/charts/champ/resources/config/appconfig/champ-api.properties b/charts/aai-champ/resources/config/appconfig/champ-api.properties
similarity index 100%
rename from charts/champ/resources/config/appconfig/champ-api.properties
rename to charts/aai-champ/resources/config/appconfig/champ-api.properties
diff --git a/charts/champ/resources/config/dynamic/conf/champ-beans.xml b/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
similarity index 97%
rename from charts/champ/resources/config/dynamic/conf/champ-beans.xml
rename to charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
index cdf3aad..f97ac16 100644
--- a/charts/champ/resources/config/dynamic/conf/champ-beans.xml
+++ b/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
@@ -23,7 +23,7 @@
<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/charts/champ/templates/configmap.yaml b/charts/aai-champ/templates/configmap.yaml
similarity index 89%
rename from charts/champ/templates/configmap.yaml
rename to charts/aai-champ/templates/configmap.yaml
index 8f48f19..a085839 100644
--- a/charts/champ/templates/configmap.yaml
+++ b/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 @@
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/charts/champ/templates/deployment.yaml b/charts/aai-champ/templates/deployment.yaml
similarity index 87%
rename from charts/champ/templates/deployment.yaml
rename to charts/aai-champ/templates/deployment.yaml
index 23314ae..ccb9021 100644
--- a/charts/champ/templates/deployment.yaml
+++ b/charts/aai-champ/templates/deployment.yaml
@@ -55,6 +55,16 @@
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 @@
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/charts/aai-champ/templates/secrets.yaml b/charts/aai-champ/templates/secrets.yaml
new file mode 100644
index 0000000..c0e2559
--- /dev/null
+++ b/charts/aai-champ/templates/secrets.yaml
@@ -0,0 +1,38 @@
+# 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
+ 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/charts/champ/templates/service.yaml b/charts/aai-champ/templates/service.yaml
similarity index 100%
rename from charts/champ/templates/service.yaml
rename to charts/aai-champ/templates/service.yaml
diff --git a/charts/champ/values.yaml b/charts/aai-champ/values.yaml
similarity index 87%
rename from charts/champ/values.yaml
rename to charts/aai-champ/values.yaml
index 91a1e52..d5d9b39 100644
--- a/charts/champ/values.yaml
+++ b/charts/aai-champ/values.yaml
@@ -24,7 +24,12 @@
#################################################################
# 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 @@
service:
type: NodePort
name: champ
- externalPort: 78
internalPort: 9522
nodePort: 78
diff --git a/charts/gizmo/.helmignore b/charts/aai-gizmo/.helmignore
similarity index 100%
rename from charts/gizmo/.helmignore
rename to charts/aai-gizmo/.helmignore
diff --git a/charts/gizmo/Chart.yaml b/charts/aai-gizmo/Chart.yaml
similarity index 97%
rename from charts/gizmo/Chart.yaml
rename to charts/aai-gizmo/Chart.yaml
index 4633b06..86f3643 100644
--- a/charts/gizmo/Chart.yaml
+++ b/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/charts/gizmo/resources/config/README.txt b/charts/aai-gizmo/resources/config/README.txt
similarity index 100%
rename from charts/gizmo/resources/config/README.txt
rename to charts/aai-gizmo/resources/config/README.txt
diff --git a/charts/gizmo/resources/config/auth/champ-cert.p12 b/charts/aai-gizmo/resources/config/auth/champ-cert.p12
similarity index 100%
rename from charts/gizmo/resources/config/auth/champ-cert.p12
rename to charts/aai-gizmo/resources/config/auth/champ-cert.p12
Binary files differ
diff --git a/charts/gizmo/resources/config/auth/crud_policy.json b/charts/aai-gizmo/resources/config/auth/crud_policy.json
similarity index 100%
rename from charts/gizmo/resources/config/auth/crud_policy.json
rename to charts/aai-gizmo/resources/config/auth/crud_policy.json
diff --git a/charts/gizmo/resources/config/auth/datarouter-cert.p12 b/charts/aai-gizmo/resources/config/auth/datarouter-cert.p12
similarity index 100%
rename from charts/gizmo/resources/config/auth/datarouter-cert.p12
rename to charts/aai-gizmo/resources/config/auth/datarouter-cert.p12
Binary files differ
diff --git a/charts/gizmo/resources/config/auth/tomcat_keystore b/charts/aai-gizmo/resources/config/auth/tomcat_keystore
similarity index 100%
rename from charts/gizmo/resources/config/auth/tomcat_keystore
rename to charts/aai-gizmo/resources/config/auth/tomcat_keystore
Binary files differ
diff --git a/charts/gizmo/resources/config/crud-api.properties b/charts/aai-gizmo/resources/config/crud-api.properties
similarity index 100%
rename from charts/gizmo/resources/config/crud-api.properties
rename to charts/aai-gizmo/resources/config/crud-api.properties
diff --git a/charts/gizmo/resources/config/crud-beans.xml b/charts/aai-gizmo/resources/config/crud-beans.xml
similarity index 95%
rename from charts/gizmo/resources/config/crud-beans.xml
rename to charts/aai-gizmo/resources/config/crud-beans.xml
index 04f1210..a6cac62 100644
--- a/charts/gizmo/resources/config/crud-beans.xml
+++ b/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/charts/gizmo/resources/config/log/filebeat/filebeat.yml b/charts/aai-gizmo/resources/config/log/filebeat/filebeat.yml
similarity index 100%
rename from charts/gizmo/resources/config/log/filebeat/filebeat.yml
rename to charts/aai-gizmo/resources/config/log/filebeat/filebeat.yml
diff --git a/charts/gizmo/resources/config/log/logback.xml b/charts/aai-gizmo/resources/config/log/logback.xml
similarity index 100%
rename from charts/gizmo/resources/config/log/logback.xml
rename to charts/aai-gizmo/resources/config/log/logback.xml
diff --git a/charts/gizmo/resources/config/model/edge_properties_v11.json b/charts/aai-gizmo/resources/config/model/edge_properties_v11.json
similarity index 100%
rename from charts/gizmo/resources/config/model/edge_properties_v11.json
rename to charts/aai-gizmo/resources/config/model/edge_properties_v11.json
diff --git a/charts/gizmo/resources/config/model/edge_properties_v12.json b/charts/aai-gizmo/resources/config/model/edge_properties_v12.json
similarity index 100%
rename from charts/gizmo/resources/config/model/edge_properties_v12.json
rename to charts/aai-gizmo/resources/config/model/edge_properties_v12.json
diff --git a/charts/gizmo/resources/config/model/edge_properties_v13.json b/charts/aai-gizmo/resources/config/model/edge_properties_v13.json
similarity index 100%
rename from charts/gizmo/resources/config/model/edge_properties_v13.json
rename to charts/aai-gizmo/resources/config/model/edge_properties_v13.json
diff --git a/charts/gizmo/templates/NOTES.txt b/charts/aai-gizmo/templates/NOTES.txt
similarity index 100%
rename from charts/gizmo/templates/NOTES.txt
rename to charts/aai-gizmo/templates/NOTES.txt
diff --git a/charts/gizmo/templates/configmap.yaml b/charts/aai-gizmo/templates/configmap.yaml
similarity index 100%
rename from charts/gizmo/templates/configmap.yaml
rename to charts/aai-gizmo/templates/configmap.yaml
diff --git a/charts/gizmo/templates/deployment.yaml b/charts/aai-gizmo/templates/deployment.yaml
similarity index 100%
rename from charts/gizmo/templates/deployment.yaml
rename to charts/aai-gizmo/templates/deployment.yaml
diff --git a/charts/gizmo/templates/secrets.yaml b/charts/aai-gizmo/templates/secrets.yaml
similarity index 100%
rename from charts/gizmo/templates/secrets.yaml
rename to charts/aai-gizmo/templates/secrets.yaml
diff --git a/charts/gizmo/templates/service.yaml b/charts/aai-gizmo/templates/service.yaml
similarity index 100%
rename from charts/gizmo/templates/service.yaml
rename to charts/aai-gizmo/templates/service.yaml
diff --git a/charts/gizmo/values.yaml b/charts/aai-gizmo/values.yaml
similarity index 100%
rename from charts/gizmo/values.yaml
rename to charts/aai-gizmo/values.yaml
diff --git a/charts/champ/Chart.yaml b/charts/champ/Chart.yaml
deleted file mode 100644
index a4ee888..0000000
--- a/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/charts/champ/templates/secrets.yaml b/charts/champ/templates/secrets.yaml
deleted file mode 100644
index e939eb9..0000000
--- a/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 }}