diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-03-17 07:41:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-17 07:41:48 +0000 |
| commit | fac22ebc8d69a36ad7c8fde78d3b1c0ff33f92eb (patch) | |
| tree | f786d0710f03a84e3a3a931b5495cd9bc9ddbbc5 /charts/aai-resources | |
| parent | 25e936bcecbd2e23544cda8a6fdde4440819d054 (diff) | |
| parent | 60e439526616731258a9ae70b16aa85ac4a8eab0 (diff) | |
Merge "SidecarRproxy: uri-auth config file to configmap"
Diffstat (limited to 'charts/aai-resources')
| -rw-r--r-- | charts/aai-resources/templates/configmap.yaml | 8 | ||||
| -rw-r--r-- | charts/aai-resources/templates/deployment.yaml | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/charts/aai-resources/templates/configmap.yaml b/charts/aai-resources/templates/configmap.yaml index b5a7fc5..0f40d04 100644 --- a/charts/aai-resources/templates/configmap.yaml +++ b/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/charts/aai-resources/templates/deployment.yaml b/charts/aai-resources/templates/deployment.yaml index d4f0111..0a46c48 100644 --- a/charts/aai-resources/templates/deployment.yaml +++ b/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 |