From 60e439526616731258a9ae70b16aa85ac4a8eab0 Mon Sep 17 00:00:00 2001 From: bwong21 Date: Thu, 14 Mar 2019 17:15:58 +0000 Subject: SidecarRproxy: uri-auth config file to configmap OOM config change to the Sidecar rproxy's configuration file uri-authorization.json to a configmap instead of secret Change-Id: I75e1908177a930e88fe2640cc1395e48bc28f19e Issue-ID: AAF-787 Signed-off-by: bwong21 --- charts/aai-champ/templates/configmap.yaml | 8 ++++++++ charts/aai-champ/templates/deployment.yaml | 9 ++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'charts/aai-champ/templates') diff --git a/charts/aai-champ/templates/configmap.yaml b/charts/aai-champ/templates/configmap.yaml index db77ae2..c3966e7 100644 --- a/charts/aai-champ/templates/configmap.yaml +++ b/charts/aai-champ/templates/configmap.yaml @@ -84,4 +84,12 @@ metadata: namespace: {{ include "common.namespace" . }} data: {{ tpl (.Files.Glob "resources/rproxy/config/logback-spring.xml").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "common.fullname" . }}-rproxy-uri-auth-config + namespace: {{ include "common.namespace" . }} +data: +{{ tpl (.Files.Glob "resources/rproxy/config/auth/uri-authorization.json").AsConfig . | indent 2 }} {{ end }} \ No newline at end of file diff --git a/charts/aai-champ/templates/deployment.yaml b/charts/aai-champ/templates/deployment.yaml index 4d4ac99..8e4d7f4 100644 --- a/charts/aai-champ/templates/deployment.yaml +++ b/charts/aai-champ/templates/deployment.yaml @@ -157,6 +157,9 @@ spec: - name: {{ include "common.fullname" . }}-rproxy-log-config mountPath: /opt/app/rproxy/config/logback-spring.xml subPath: logback-spring.xml + - name: {{ include "common.fullname" . }}-rproxy-uri-auth-config + mountPath: /opt/app/rproxy/config/auth/uri-authorization.json + subPath: uri-authorization.json - name: {{ include "common.fullname" . }}-rproxy-auth-certs mountPath: /opt/app/rproxy/config/auth/tomcat_keystore subPath: tomcat_keystore @@ -166,9 +169,6 @@ spec: - name: {{ include "common.fullname" . }}-rproxy-auth-certs mountPath: /opt/app/rproxy/config/auth/org.onap.aai.p12 subPath: org.onap.aai.p12 - - name: {{ include "common.fullname" . }}-rproxy-auth-config - mountPath: /opt/app/rproxy/config/auth/uri-authorization.json - subPath: uri-authorization.json - name: {{ include "common.fullname" . }}-rproxy-security-config mountPath: /opt/app/rproxy/config/security/keyfile subPath: keyfile @@ -247,6 +247,9 @@ spec: - name: {{ include "common.fullname" . }}-rproxy-log-config configMap: name: {{ include "common.fullname" . }}-rproxy-log-config + - name: {{ include "common.fullname" . }}-rproxy-uri-auth-config + configMap: + name: {{ include "common.fullname" . }}-rproxy-uri-auth-config - name: {{ include "common.fullname" . }}-rproxy-auth-config secret: secretName: {{ include "common.fullname" . }}-rproxy-auth-config -- cgit 1.2.3-korg