summaryrefslogtreecommitdiffstats
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
commit929e0e7a5e94f90a6ec209e50e6c37eae3771827 (patch)
treeedea630f815f10e2f5438aedf84c8fe31062c075
parent940f53896630a76d41d598f60d07792a4a0fb8e1 (diff)
parent4879820e3a534594e2793733c4e705b90d4ea874 (diff)
Merge "aai search data config alignment"
-rw-r--r--kubernetes/aai/resources/config/log/search-data-service/logback.xml (renamed from kubernetes/aai/resources/search-data-service/conf/logback.xml)0
-rw-r--r--kubernetes/aai/templates/search-data-service-configmap.yaml8
-rw-r--r--kubernetes/aai/templates/search-data-service-deployment.yaml10
3 files changed, 9 insertions, 9 deletions
diff --git a/kubernetes/aai/resources/search-data-service/conf/logback.xml b/kubernetes/aai/resources/config/log/search-data-service/logback.xml
index 14ed4142fe..14ed4142fe 100644
--- a/kubernetes/aai/resources/search-data-service/conf/logback.xml
+++ b/kubernetes/aai/resources/config/log/search-data-service/logback.xml
diff --git a/kubernetes/aai/templates/search-data-service-configmap.yaml b/kubernetes/aai/templates/search-data-service-configmap.yaml
index c392e412aa..8f707d4ca3 100644
--- a/kubernetes/aai/templates/search-data-service-configmap.yaml
+++ b/kubernetes/aai/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/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml
index 392a754459..5f667106a7 100644
--- a/kubernetes/aai/templates/search-data-service-deployment.yaml
+++ b/kubernetes/aai/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 }}