diff options
author | Daniel Silverthorn <daniel.silverthorn@amdocs.com> | 2018-03-28 19:18:19 +0000 |
---|---|---|
committer | Daniel Silverthorn <daniel.silverthorn@amdocs.com> | 2018-04-03 13:43:53 +0000 |
commit | 3102326877a615d6e4d9087b1a345ee0d89c31d0 (patch) | |
tree | bbec62d640051c0eab0b493f5ae40c6f4c1a2424 /charts | |
parent | 8bc9a7ca202e417cd82b1fd639c11a4a2daf6a56 (diff) |
Conform to helm standards
Change-Id: I6cda4dbc168ae6cb110deca5596e5d96f517e7fe
Issue-ID: OOM-790
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
Diffstat (limited to 'charts')
-rw-r--r-- | charts/aai-champ/Chart.yaml (renamed from charts/champ/Chart.yaml) | 4 | ||||
-rw-r--r-- | charts/aai-champ/requirements.yaml (renamed from charts/champ/requirements.yaml) | 0 | ||||
-rw-r--r-- | charts/aai-champ/resources/config/appconfig/auth/champ_policy.json (renamed from charts/champ/resources/config/appconfig/auth/champ_policy.json) | 0 | ||||
-rw-r--r-- | charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore (renamed from charts/champ/resources/config/appconfig/auth/tomcat_keystore) | bin | 2214 -> 2214 bytes | |||
-rw-r--r-- | charts/aai-champ/resources/config/appconfig/champ-api.properties (renamed from charts/champ/resources/config/appconfig/champ-api.properties) | 0 | ||||
-rw-r--r-- | charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml (renamed from charts/champ/resources/config/dynamic/conf/champ-beans.xml) | 2 | ||||
-rw-r--r-- | charts/aai-champ/templates/configmap.yaml (renamed from charts/champ/templates/configmap.yaml) | 4 | ||||
-rw-r--r-- | charts/aai-champ/templates/deployment.yaml (renamed from charts/champ/templates/deployment.yaml) | 16 | ||||
-rw-r--r-- | charts/aai-champ/templates/secrets.yaml (renamed from charts/champ/templates/secrets.yaml) | 18 | ||||
-rw-r--r-- | charts/aai-champ/templates/service.yaml (renamed from charts/champ/templates/service.yaml) | 0 | ||||
-rw-r--r-- | charts/aai-champ/values.yaml (renamed from charts/champ/values.yaml) | 8 | ||||
-rw-r--r-- | charts/aai-gizmo/.helmignore (renamed from charts/gizmo/.helmignore) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/Chart.yaml (renamed from charts/gizmo/Chart.yaml) | 4 | ||||
-rw-r--r-- | charts/aai-gizmo/resources/config/README.txt (renamed from charts/gizmo/resources/config/README.txt) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/resources/config/auth/champ-cert.p12 (renamed from charts/gizmo/resources/config/auth/champ-cert.p12) | bin | 2556 -> 2556 bytes | |||
-rw-r--r-- | charts/aai-gizmo/resources/config/auth/crud_policy.json (renamed from charts/gizmo/resources/config/auth/crud_policy.json) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/resources/config/auth/datarouter-cert.p12 (renamed from charts/gizmo/resources/config/auth/datarouter-cert.p12) | bin | 2556 -> 2556 bytes | |||
-rw-r--r-- | charts/aai-gizmo/resources/config/auth/tomcat_keystore (renamed from charts/gizmo/resources/config/auth/tomcat_keystore) | bin | 2214 -> 2214 bytes | |||
-rw-r--r-- | charts/aai-gizmo/resources/config/crud-api.properties (renamed from charts/gizmo/resources/config/crud-api.properties) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/resources/config/crud-beans.xml (renamed from charts/gizmo/resources/config/crud-beans.xml) | 4 | ||||
-rw-r--r-- | charts/aai-gizmo/resources/config/log/filebeat/filebeat.yml (renamed from charts/gizmo/resources/config/log/filebeat/filebeat.yml) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/resources/config/log/logback.xml (renamed from charts/gizmo/resources/config/log/logback.xml) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/resources/config/model/edge_properties_v11.json (renamed from charts/gizmo/resources/config/model/edge_properties_v11.json) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/resources/config/model/edge_properties_v12.json (renamed from charts/gizmo/resources/config/model/edge_properties_v12.json) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/resources/config/model/edge_properties_v13.json (renamed from charts/gizmo/resources/config/model/edge_properties_v13.json) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/templates/NOTES.txt (renamed from charts/gizmo/templates/NOTES.txt) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/templates/configmap.yaml (renamed from charts/gizmo/templates/configmap.yaml) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/templates/deployment.yaml (renamed from charts/gizmo/templates/deployment.yaml) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/templates/secrets.yaml (renamed from charts/gizmo/templates/secrets.yaml) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/templates/service.yaml (renamed from charts/gizmo/templates/service.yaml) | 0 | ||||
-rw-r--r-- | charts/aai-gizmo/values.yaml (renamed from charts/gizmo/values.yaml) | 0 |
31 files changed, 45 insertions, 15 deletions
diff --git a/charts/champ/Chart.yaml b/charts/aai-champ/Chart.yaml index a4ee888..1704337 100644 --- a/charts/champ/Chart.yaml +++ b/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/charts/champ/requirements.yaml b/charts/aai-champ/requirements.yaml index 9552dfd..9552dfd 100644 --- a/charts/champ/requirements.yaml +++ b/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 index ee04a71..ee04a71 100644 --- a/charts/champ/resources/config/appconfig/auth/champ_policy.json +++ b/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 Binary files differindex 9eec841..9eec841 100644 --- a/charts/champ/resources/config/appconfig/auth/tomcat_keystore +++ b/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore diff --git a/charts/champ/resources/config/appconfig/champ-api.properties b/charts/aai-champ/resources/config/appconfig/champ-api.properties index 3b90c55..3b90c55 100644 --- a/charts/champ/resources/config/appconfig/champ-api.properties +++ b/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 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 @@ 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/charts/champ/templates/configmap.yaml b/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 @@ 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/charts/champ/templates/deployment.yaml b/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 @@ 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/charts/champ/templates/secrets.yaml b/charts/aai-champ/templates/secrets.yaml index e939eb9..c0e2559 100644 --- a/charts/champ/templates/secrets.yaml +++ b/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/charts/champ/templates/service.yaml b/charts/aai-champ/templates/service.yaml index 93b0fd1..93b0fd1 100644 --- a/charts/champ/templates/service.yaml +++ b/charts/aai-champ/templates/service.yaml diff --git a/charts/champ/values.yaml b/charts/aai-champ/values.yaml index 91a1e52..d5d9b39 100644 --- a/charts/champ/values.yaml +++ b/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/charts/gizmo/.helmignore b/charts/aai-gizmo/.helmignore index f0c1319..f0c1319 100644 --- a/charts/gizmo/.helmignore +++ b/charts/aai-gizmo/.helmignore diff --git a/charts/gizmo/Chart.yaml b/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 index 5cc0149..5cc0149 100644 --- a/charts/gizmo/resources/config/README.txt +++ b/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 Binary files differindex dbf4fca..dbf4fca 100644 --- a/charts/gizmo/resources/config/auth/champ-cert.p12 +++ b/charts/aai-gizmo/resources/config/auth/champ-cert.p12 diff --git a/charts/gizmo/resources/config/auth/crud_policy.json b/charts/aai-gizmo/resources/config/auth/crud_policy.json index d8b065e..d8b065e 100644 --- a/charts/gizmo/resources/config/auth/crud_policy.json +++ b/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 Binary files differindex dbf4fca..dbf4fca 100644 --- a/charts/gizmo/resources/config/auth/datarouter-cert.p12 +++ b/charts/aai-gizmo/resources/config/auth/datarouter-cert.p12 diff --git a/charts/gizmo/resources/config/auth/tomcat_keystore b/charts/aai-gizmo/resources/config/auth/tomcat_keystore Binary files differindex 9eec841..9eec841 100644 --- a/charts/gizmo/resources/config/auth/tomcat_keystore +++ b/charts/aai-gizmo/resources/config/auth/tomcat_keystore diff --git a/charts/gizmo/resources/config/crud-api.properties b/charts/aai-gizmo/resources/config/crud-api.properties index a86d472..a86d472 100644 --- a/charts/gizmo/resources/config/crud-api.properties +++ b/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 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 index 9ad559c..9ad559c 100644 --- a/charts/gizmo/resources/config/log/filebeat/filebeat.yml +++ b/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 index f63afd3..f63afd3 100644 --- a/charts/gizmo/resources/config/log/logback.xml +++ b/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 index 8d00636..8d00636 100644 --- a/charts/gizmo/resources/config/model/edge_properties_v11.json +++ b/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 index 8d00636..8d00636 100644 --- a/charts/gizmo/resources/config/model/edge_properties_v12.json +++ b/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 index 8d00636..8d00636 100644 --- a/charts/gizmo/resources/config/model/edge_properties_v13.json +++ b/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 index 24371d0..24371d0 100644 --- a/charts/gizmo/templates/NOTES.txt +++ b/charts/aai-gizmo/templates/NOTES.txt diff --git a/charts/gizmo/templates/configmap.yaml b/charts/aai-gizmo/templates/configmap.yaml index b988d31..b988d31 100644 --- a/charts/gizmo/templates/configmap.yaml +++ b/charts/aai-gizmo/templates/configmap.yaml diff --git a/charts/gizmo/templates/deployment.yaml b/charts/aai-gizmo/templates/deployment.yaml index 80b5390..80b5390 100644 --- a/charts/gizmo/templates/deployment.yaml +++ b/charts/aai-gizmo/templates/deployment.yaml diff --git a/charts/gizmo/templates/secrets.yaml b/charts/aai-gizmo/templates/secrets.yaml index f5d8ec8..f5d8ec8 100644 --- a/charts/gizmo/templates/secrets.yaml +++ b/charts/aai-gizmo/templates/secrets.yaml diff --git a/charts/gizmo/templates/service.yaml b/charts/aai-gizmo/templates/service.yaml index f88a4e9..f88a4e9 100644 --- a/charts/gizmo/templates/service.yaml +++ b/charts/aai-gizmo/templates/service.yaml diff --git a/charts/gizmo/values.yaml b/charts/aai-gizmo/values.yaml index de84285..de84285 100644 --- a/charts/gizmo/values.yaml +++ b/charts/aai-gizmo/values.yaml |