summaryrefslogtreecommitdiffstats
path: root/charts/aai-resources
diff options
context:
space:
mode:
authorArul.Nambi <arul.nambi@amdocs.com>2019-01-08 01:55:24 -0500
committerArul.Nambi <arul.nambi@amdocs.com>2019-01-09 10:54:48 -0500
commitaf0444d85fff12f6a784ce11e7d668bca7a87936 (patch)
tree473d73ce406739148dc660c1876ab1d26334e502 /charts/aai-resources
parent3d763409f1e9dde035ecb6bdb5560ad17aac2f32 (diff)
Moving the trustore to parent folder
Issue-ID: OOM-1556 Change-Id: I0e6bf66ec871d4de53ebaad23426119c5f425ac9 Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
Diffstat (limited to 'charts/aai-resources')
-rw-r--r--charts/aai-resources/resources/config/aaf/truststoreONAPall.jksbin114865 -> 0 bytes
-rw-r--r--charts/aai-resources/templates/configmap.yaml1
-rw-r--r--charts/aai-resources/templates/deployment.yaml5
3 files changed, 4 insertions, 2 deletions
diff --git a/charts/aai-resources/resources/config/aaf/truststoreONAPall.jks b/charts/aai-resources/resources/config/aaf/truststoreONAPall.jks
deleted file mode 100644
index 2da1dcc..0000000
--- a/charts/aai-resources/resources/config/aaf/truststoreONAPall.jks
+++ /dev/null
Binary files differ
diff --git a/charts/aai-resources/templates/configmap.yaml b/charts/aai-resources/templates/configmap.yaml
index 4fd939d..b5a7fc5 100644
--- a/charts/aai-resources/templates/configmap.yaml
+++ b/charts/aai-resources/templates/configmap.yaml
@@ -134,7 +134,6 @@ type: Opaque
data:
{{ tpl (.Files.Glob "resources/config/aaf/org.onap.aai.keyfile").AsSecrets . | indent 2 }}
{{ tpl (.Files.Glob "resources/config/aaf/org.onap.aai.p12").AsSecrets . | indent 2 }}
-{{ tpl (.Files.Glob "resources/config/aaf/truststoreONAPall.jks").AsSecrets . | indent 2 }}
{{ tpl (.Files.Glob "resources/config/aaf/bath_config.csv").AsSecrets . | indent 2 }}
{{ if .Values.global.installSidecarSecurity }}
diff --git a/charts/aai-resources/templates/deployment.yaml b/charts/aai-resources/templates/deployment.yaml
index 8d7b740..3a1d6e6 100644
--- a/charts/aai-resources/templates/deployment.yaml
+++ b/charts/aai-resources/templates/deployment.yaml
@@ -515,7 +515,7 @@ spec:
name: {{ include "common.fullname" . }}-aaf-certs
subPath: org.onap.aai.p12
- mountPath: /opt/app/aai-resources/resources/aaf/truststoreONAPall.jks
- name: {{ include "common.fullname" . }}-aaf-certs
+ name: aai-common-aai-auth-mount
subPath: truststoreONAPall.jks
- mountPath: /opt/app/aai-resources/resources/application.properties
name: {{ include "common.fullname" . }}-springapp-conf
@@ -647,6 +647,9 @@ spec:
{{ end }}
volumes:
+ - name: aai-common-aai-auth-mount
+ secret:
+ secretName: aai-common-aai-auth
- name: localtime
hostPath:
path: /etc/localtime