summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-02-09 14:50:19 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-09 14:50:19 +0000
commit887165154196c36afcf17df2ef691ac5b0aaa9d3 (patch)
tree82386fd34c741a263ab013cebf1ab99a23533025 /templates
parent437c8f676a2b2785b438e0d461a95be03e5391cd (diff)
parent08b083891e67ecc70a500be034bce8962590381e (diff)
Merge "aai search data config alignment"
Diffstat (limited to 'templates')
-rw-r--r--templates/search-data-service-configmap.yaml8
-rw-r--r--templates/search-data-service-deployment.yaml10
2 files changed, 9 insertions, 9 deletions
diff --git a/templates/search-data-service-configmap.yaml b/templates/search-data-service-configmap.yaml
index c392e41..8f707d4 100644
--- a/templates/search-data-service-configmap.yaml
+++ b/templates/search-data-service-configmap.yaml
@@ -23,4 +23,12 @@ metadata:
namespace: {{ .Values.nsPrefix }}-aai
data:
{{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/auth/search_policy.json").AsSecrets . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: aai-search-data-service-log-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/log/search-data-service/logback.xml").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/templates/search-data-service-deployment.yaml b/templates/search-data-service-deployment.yaml
index 392a754..5f66710 100644
--- a/templates/search-data-service-deployment.yaml
+++ b/templates/search-data-service-deployment.yaml
@@ -89,16 +89,8 @@ spec:
emptyDir: {}
- name: aai-search-data-service-log-conf
configMap:
- name: aai-search-data-service-configmap
+ name: aai-search-data-service-log-configmap
restartPolicy: Always
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: aai-search-data-service-configmap
- namespace: {{ .Values.nsPrefix }}-aai
-data:
-{{ (.Files.Glob "resources/search-data-service/conf/logback.xml").AsConfig | indent 2 }}
#{{ end }}