summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/aai/charts/aai-champ/Chart.yaml (renamed from kubernetes/aai/charts/champ/Chart.yaml)4
-rw-r--r--kubernetes/aai/charts/aai-champ/requirements.yaml (renamed from kubernetes/aai/charts/champ/requirements.yaml)0
-rw-r--r--kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/champ_policy.json (renamed from kubernetes/aai/charts/champ/resources/config/appconfig/auth/champ_policy.json)0
-rw-r--r--kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore (renamed from kubernetes/aai/charts/champ/resources/config/appconfig/auth/tomcat_keystore)bin2214 -> 2214 bytes
-rw-r--r--kubernetes/aai/charts/aai-champ/resources/config/appconfig/champ-api.properties (renamed from kubernetes/aai/charts/champ/resources/config/appconfig/champ-api.properties)0
-rw-r--r--kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml (renamed from kubernetes/aai/charts/champ/resources/config/dynamic/conf/champ-beans.xml)2
-rw-r--r--kubernetes/aai/charts/aai-champ/templates/configmap.yaml (renamed from kubernetes/aai/charts/champ/templates/configmap.yaml)4
-rw-r--r--kubernetes/aai/charts/aai-champ/templates/deployment.yaml (renamed from kubernetes/aai/charts/champ/templates/deployment.yaml)16
-rw-r--r--kubernetes/aai/charts/aai-champ/templates/secrets.yaml (renamed from kubernetes/aai/charts/champ/templates/secrets.yaml)18
-rw-r--r--kubernetes/aai/charts/aai-champ/templates/service.yaml (renamed from kubernetes/aai/charts/champ/templates/service.yaml)0
-rw-r--r--kubernetes/aai/charts/aai-champ/values.yaml (renamed from kubernetes/aai/charts/champ/values.yaml)8
-rw-r--r--kubernetes/aai/charts/aai-gizmo/.helmignore (renamed from kubernetes/aai/charts/gizmo/.helmignore)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/Chart.yaml (renamed from kubernetes/aai/charts/gizmo/Chart.yaml)4
-rw-r--r--kubernetes/aai/charts/aai-gizmo/resources/config/README.txt (renamed from kubernetes/aai/charts/gizmo/resources/config/README.txt)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/resources/config/auth/champ-cert.p12 (renamed from kubernetes/aai/charts/gizmo/resources/config/auth/champ-cert.p12)bin2556 -> 2556 bytes
-rw-r--r--kubernetes/aai/charts/aai-gizmo/resources/config/auth/crud_policy.json (renamed from kubernetes/aai/charts/gizmo/resources/config/auth/crud_policy.json)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/resources/config/auth/datarouter-cert.p12 (renamed from kubernetes/aai/charts/gizmo/resources/config/auth/datarouter-cert.p12)bin2556 -> 2556 bytes
-rw-r--r--kubernetes/aai/charts/aai-gizmo/resources/config/auth/tomcat_keystore (renamed from kubernetes/aai/charts/gizmo/resources/config/auth/tomcat_keystore)bin2214 -> 2214 bytes
-rw-r--r--kubernetes/aai/charts/aai-gizmo/resources/config/crud-api.properties (renamed from kubernetes/aai/charts/gizmo/resources/config/crud-api.properties)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/resources/config/crud-beans.xml (renamed from kubernetes/aai/charts/gizmo/resources/config/crud-beans.xml)4
-rw-r--r--kubernetes/aai/charts/aai-gizmo/resources/config/log/filebeat/filebeat.yml (renamed from kubernetes/aai/charts/gizmo/resources/config/log/filebeat/filebeat.yml)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/resources/config/log/logback.xml (renamed from kubernetes/aai/charts/gizmo/resources/config/log/logback.xml)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/resources/config/model/edge_properties_v11.json (renamed from kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v11.json)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/resources/config/model/edge_properties_v12.json (renamed from kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v12.json)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/resources/config/model/edge_properties_v13.json (renamed from kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v13.json)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/templates/NOTES.txt (renamed from kubernetes/aai/charts/gizmo/templates/NOTES.txt)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/templates/configmap.yaml (renamed from kubernetes/aai/charts/gizmo/templates/configmap.yaml)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml (renamed from kubernetes/aai/charts/gizmo/templates/deployment.yaml)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/templates/secrets.yaml (renamed from kubernetes/aai/charts/gizmo/templates/secrets.yaml)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/templates/service.yaml (renamed from kubernetes/aai/charts/gizmo/templates/service.yaml)0
-rw-r--r--kubernetes/aai/charts/aai-gizmo/values.yaml (renamed from kubernetes/aai/charts/gizmo/values.yaml)0
31 files changed, 45 insertions, 15 deletions
diff --git a/kubernetes/aai/charts/champ/Chart.yaml b/kubernetes/aai/charts/aai-champ/Chart.yaml
index a4ee888fce..1704337efa 100644
--- 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
index 9552dfd9e0..9552dfd9e0 100644
--- a/kubernetes/aai/charts/champ/requirements.yaml
+++ b/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
index ee04a714be..ee04a714be 100644
--- 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
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
index 9eec841aa2..9eec841aa2 100644
--- a/kubernetes/aai/charts/champ/resources/config/appconfig/auth/tomcat_keystore
+++ b/kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore
Binary files differ
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
index 3b90c5522f..3b90c5522f 100644
--- a/kubernetes/aai/charts/champ/resources/config/appconfig/champ-api.properties
+++ b/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
index cdf3aada40..f97ac16864 100644
--- 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
index 8f48f199f8..a085839cc1 100644
--- 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
index 23314aeee4..ccb90213d9 100644
--- 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
index e939eb904b..c0e2559db9 100644
--- 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
index 93b0fd1254..93b0fd1254 100644
--- a/kubernetes/aai/charts/champ/templates/service.yaml
+++ b/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
index 91a1e52091..d5d9b39423 100644
--- 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
index f0c1319444..f0c1319444 100644
--- a/kubernetes/aai/charts/gizmo/.helmignore
+++ b/kubernetes/aai/charts/aai-gizmo/.helmignore
diff --git a/kubernetes/aai/charts/gizmo/Chart.yaml b/kubernetes/aai/charts/aai-gizmo/Chart.yaml
index 4633b06dff..86f364331e 100644
--- 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
index 5cc01497f5..5cc01497f5 100644
--- a/kubernetes/aai/charts/gizmo/resources/config/README.txt
+++ b/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
index dbf4fcacec..dbf4fcacec 100644
--- a/kubernetes/aai/charts/gizmo/resources/config/auth/champ-cert.p12
+++ b/kubernetes/aai/charts/aai-gizmo/resources/config/auth/champ-cert.p12
Binary files differ
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
index d8b065e7f6..d8b065e7f6 100644
--- a/kubernetes/aai/charts/gizmo/resources/config/auth/crud_policy.json
+++ b/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
index dbf4fcacec..dbf4fcacec 100644
--- a/kubernetes/aai/charts/gizmo/resources/config/auth/datarouter-cert.p12
+++ b/kubernetes/aai/charts/aai-gizmo/resources/config/auth/datarouter-cert.p12
Binary files differ
diff --git a/kubernetes/aai/charts/gizmo/resources/config/auth/tomcat_keystore b/kubernetes/aai/charts/aai-gizmo/resources/config/auth/tomcat_keystore
index 9eec841aa2..9eec841aa2 100644
--- a/kubernetes/aai/charts/gizmo/resources/config/auth/tomcat_keystore
+++ b/kubernetes/aai/charts/aai-gizmo/resources/config/auth/tomcat_keystore
Binary files differ
diff --git a/kubernetes/aai/charts/gizmo/resources/config/crud-api.properties b/kubernetes/aai/charts/aai-gizmo/resources/config/crud-api.properties
index a86d47203a..a86d47203a 100644
--- a/kubernetes/aai/charts/gizmo/resources/config/crud-api.properties
+++ b/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
index 04f1210433..a6cac628db 100644
--- 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
index 9ad559c027..9ad559c027 100644
--- a/kubernetes/aai/charts/gizmo/resources/config/log/filebeat/filebeat.yml
+++ b/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
index f63afd3c6b..f63afd3c6b 100644
--- a/kubernetes/aai/charts/gizmo/resources/config/log/logback.xml
+++ b/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
index 8d00636d27..8d00636d27 100644
--- 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
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
index 8d00636d27..8d00636d27 100644
--- 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
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
index 8d00636d27..8d00636d27 100644
--- 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
diff --git a/kubernetes/aai/charts/gizmo/templates/NOTES.txt b/kubernetes/aai/charts/aai-gizmo/templates/NOTES.txt
index 24371d08ab..24371d08ab 100644
--- a/kubernetes/aai/charts/gizmo/templates/NOTES.txt
+++ b/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
index b988d31fd9..b988d31fd9 100644
--- a/kubernetes/aai/charts/gizmo/templates/configmap.yaml
+++ b/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
index 80b5390d08..80b5390d08 100644
--- a/kubernetes/aai/charts/gizmo/templates/deployment.yaml
+++ b/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
index f5d8ec8ba5..f5d8ec8ba5 100644
--- a/kubernetes/aai/charts/gizmo/templates/secrets.yaml
+++ b/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
index f88a4e9533..f88a4e9533 100644
--- a/kubernetes/aai/charts/gizmo/templates/service.yaml
+++ b/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
index de842859fe..de842859fe 100644
--- a/kubernetes/aai/charts/gizmo/values.yaml
+++ b/kubernetes/aai/charts/aai-gizmo/values.yaml