summaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/charts/aai-resources
diff options
context:
space:
mode:
authorbwong21 <bwong@amdocs.com>2019-03-14 17:15:58 +0000
committerbwong21 <bwong@amdocs.com>2019-03-14 17:25:13 +0000
commit8737f7ead2eb23a90926fcf36703d368f16cf10e (patch)
tree1b898fe81df2e1a279f4573b0971e9b8e905ff48 /kubernetes/aai/charts/aai-resources
parenta3589e313c7205754aecdc8e8430cb5459f20ef1 (diff)
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 <bwong@amdocs.com>
Diffstat (limited to 'kubernetes/aai/charts/aai-resources')
-rw-r--r--kubernetes/aai/charts/aai-resources/templates/configmap.yaml8
-rw-r--r--kubernetes/aai/charts/aai-resources/templates/deployment.yaml9
2 files changed, 14 insertions, 3 deletions
diff --git a/kubernetes/aai/charts/aai-resources/templates/configmap.yaml b/kubernetes/aai/charts/aai-resources/templates/configmap.yaml
index b5a7fc562f..0f40d04dae 100644
--- a/kubernetes/aai/charts/aai-resources/templates/configmap.yaml
+++ b/kubernetes/aai/charts/aai-resources/templates/configmap.yaml
@@ -203,6 +203,14 @@ 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 }}
+---
+apiVersion: v1
kind: Secret
metadata:
name: {{ include "common.fullname" . }}-rproxy-auth-config
diff --git a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
index d4f0111a5c..0a46c48717 100644
--- a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
@@ -723,6 +723,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-config
mountPath: /opt/app/rproxy/config/auth/tomcat_keystore
subPath: tomcat_keystore
@@ -730,9 +733,6 @@ spec:
mountPath: /opt/app/rproxy/config/auth/client-cert.p12
subPath: client-cert.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-auth-config
mountPath: /opt/app/rproxy/config/auth/aaf_truststore.jks
subPath: aaf_truststore.jks
- name: {{ include "common.fullname" . }}-rproxy-security-config
@@ -835,6 +835,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