diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-01-16 21:20:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-01-16 21:20:03 +0000 |
| commit | 42f5651de0c3c634056b499aeb2ccf12a9039597 (patch) | |
| tree | 471b50ffe6c9e73b385198a5257d0669ec102243 /kubernetes/aai/charts/aai-resources | |
| parent | 462d2b227fbfad5fcb093eccb2bdd3efb7e60254 (diff) | |
| parent | c5f034a7cc279379b934c768f7b70e4f38c0664d (diff) | |
Merge "Moving the trustore to parent folder"
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 d93ab5af46..cac8f4b89f 100644 --- a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml +++ b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml @@ -641,7 +641,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 @@ -773,6 +773,9 @@ spec: {{ end }} volumes: + - name: aai-common-aai-auth-mount + secret: + secretName: aai-common-aai-auth - name: localtime hostPath: path: /etc/localtime |