diff options
| author |   Arul.Nambi <arul.nambi@amdocs.com> | 2019-01-08 01:55:24 -0500 |
|---|---|---|
| committer | Arul.Nambi <arul.nambi@amdocs.com> | 2019-01-09 10:54:48 -0500 |
| commit | c5f034a7cc279379b934c768f7b70e4f38c0664d (patch) | |
| tree | 0fb6d5f55ee2b5375b5c6d1c3156b32d23fa51d7 /kubernetes/aai/charts/aai-resources | |
| parent | 3b49088f814029b7b5635522a9fd3cd2c0000c12 (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 'kubernetes/aai/charts/aai-resources')
| -rw-r--r-- | kubernetes/aai/charts/aai-resources/resources/config/aaf/truststoreONAPall.jks | bin | 114865 -> 0 bytes | |||
| -rw-r--r-- | kubernetes/aai/charts/aai-resources/templates/configmap.yaml | 1 | ||||
| -rw-r--r-- | kubernetes/aai/charts/aai-resources/templates/deployment.yaml | 5 |
3 files changed, 4 insertions, 2 deletions
diff --git a/kubernetes/aai/charts/aai-resources/resources/config/aaf/truststoreONAPall.jks b/kubernetes/aai/charts/aai-resources/resources/config/aaf/truststoreONAPall.jks Binary files differdeleted file mode 100644 index 2da1dcc4b4..0000000000 --- a/kubernetes/aai/charts/aai-resources/resources/config/aaf/truststoreONAPall.jks +++ /dev/null diff --git a/kubernetes/aai/charts/aai-resources/templates/configmap.yaml b/kubernetes/aai/charts/aai-resources/templates/configmap.yaml index 4fd939dbd0..b5a7fc562f 100644 --- a/kubernetes/aai/charts/aai-resources/templates/configmap.yaml +++ b/kubernetes/aai/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/kubernetes/aai/charts/aai-resources/templates/deployment.yaml b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml index 8d7b740276..3a1d6e6a00 100644 --- a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml +++ b/kubernetes/aai/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 |