From af0444d85fff12f6a784ce11e7d668bca7a87936 Mon Sep 17 00:00:00 2001 From: "Arul.Nambi" Date: Tue, 8 Jan 2019 01:55:24 -0500 Subject: Moving the trustore to parent folder Issue-ID: OOM-1556 Change-Id: I0e6bf66ec871d4de53ebaad23426119c5f425ac9 Signed-off-by: Arul.Nambi --- .../resources/config/aaf/truststoreONAPall.jks | Bin 114865 -> 0 bytes charts/aai-resources/templates/configmap.yaml | 1 - charts/aai-resources/templates/deployment.yaml | 5 ++++- .../resources/config/auth/truststoreONAPall.jks | Bin 117990 -> 0 bytes charts/aai-sparky-be/templates/deployment.yaml | 20 +++++++++++++++++++- .../resources/config/aaf/truststoreONAPall.jks | Bin 114865 -> 0 bytes charts/aai-traversal/templates/configmap.yaml | 1 - charts/aai-traversal/templates/deployment.yaml | 5 ++++- 8 files changed, 27 insertions(+), 5 deletions(-) delete mode 100644 charts/aai-resources/resources/config/aaf/truststoreONAPall.jks delete mode 100644 charts/aai-sparky-be/resources/config/auth/truststoreONAPall.jks delete mode 100644 charts/aai-traversal/resources/config/aaf/truststoreONAPall.jks (limited to 'charts') 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 Binary files a/charts/aai-resources/resources/config/aaf/truststoreONAPall.jks and /dev/null 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 diff --git a/charts/aai-sparky-be/resources/config/auth/truststoreONAPall.jks b/charts/aai-sparky-be/resources/config/auth/truststoreONAPall.jks deleted file mode 100644 index ff844b1..0000000 Binary files a/charts/aai-sparky-be/resources/config/auth/truststoreONAPall.jks and /dev/null differ diff --git a/charts/aai-sparky-be/templates/deployment.yaml b/charts/aai-sparky-be/templates/deployment.yaml index a596a6b..ac9cf77 100644 --- a/charts/aai-sparky-be/templates/deployment.yaml +++ b/charts/aai-sparky-be/templates/deployment.yaml @@ -63,8 +63,21 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true - - mountPath: /opt/app/sparky/config/auth/ + - mountPath: /opt/app/sparky/config/auth/client-cert-onap.p12 name: {{ include "common.fullname" . }}-auth-config + subPath: client-cert-onap.p12 + + - mountPath: /opt/app/sparky/config/auth/csp-cookie-filter.properties + name: {{ include "common.fullname" . }}-auth-config + subPath: csp-cookie-filter.properties + + - mountPath: /opt/app/sparky/config/auth/org.onap.aai.p12 + name: {{ include "common.fullname" . }}-auth-config + subPath: org.onap.aai.p12 + + - mountPath: /opt/app/sparky/config/auth/truststoreONAPall.jks + name: aai-common-aai-auth-mount + subPath: truststoreONAPall.jks - mountPath: /opt/app/sparky/config/portal/ name: {{ include "common.fullname" . }}-portal-config @@ -171,6 +184,11 @@ spec: - name: {{ include "common.fullname" . }}-auth-config secret: secretName: {{ include "common.fullname" . }} + + - name: aai-common-aai-auth-mount + secret: + secretName: aai-common-aai-auth + - name: filebeat-conf configMap: name: aai-filebeat diff --git a/charts/aai-traversal/resources/config/aaf/truststoreONAPall.jks b/charts/aai-traversal/resources/config/aaf/truststoreONAPall.jks deleted file mode 100644 index 2da1dcc..0000000 Binary files a/charts/aai-traversal/resources/config/aaf/truststoreONAPall.jks and /dev/null differ diff --git a/charts/aai-traversal/templates/configmap.yaml b/charts/aai-traversal/templates/configmap.yaml index 79d6abd..106031e 100644 --- a/charts/aai-traversal/templates/configmap.yaml +++ b/charts/aai-traversal/templates/configmap.yaml @@ -133,5 +133,4 @@ 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 }} diff --git a/charts/aai-traversal/templates/deployment.yaml b/charts/aai-traversal/templates/deployment.yaml index 834ab32..19f21d3 100644 --- a/charts/aai-traversal/templates/deployment.yaml +++ b/charts/aai-traversal/templates/deployment.yaml @@ -329,7 +329,7 @@ spec: name: {{ include "common.fullname" . }}-aaf-certs subPath: org.onap.aai.p12 - mountPath: /opt/app/aai-traversal/resources/aaf/truststoreONAPall.jks - name: {{ include "common.fullname" . }}-aaf-certs + name: aai-common-aai-auth-mount subPath: truststoreONAPall.jks - mountPath: /opt/app/aai-traversal/resources/application.properties name: {{ include "common.fullname" . }}-springapp-conf @@ -412,6 +412,9 @@ spec: - name: {{ include "common.fullname" . }}-aaf-certs secret: secretName: {{ include "common.fullname" . }}-aaf-keys + - name: aai-common-aai-auth-mount + secret: + secretName: aai-common-aai-auth - name: {{ include "common.fullname" . }}-springapp-conf configMap: name: {{ include "common.fullname" . }}-springapp-configmap -- cgit 1.2.3-korg