aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-02-09 14:50:18 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-09 14:50:18 +0000
commit940f53896630a76d41d598f60d07792a4a0fb8e1 (patch)
tree7f10ba2327b7f042d51f260129d72e2bf44b4adc
parent92facf7ad7dd313912914c2941cfd0e296123ada (diff)
parent33e3cc0ad06c0253aab8a0f285b9eadc1149fed2 (diff)
Merge "aai model loader config alignment"
-rw-r--r--kubernetes/aai/resources/config/log/model-loader/logback.xml (renamed from kubernetes/aai/resources/model-loader/conf/logback.xml)0
-rw-r--r--kubernetes/aai/templates/modelloader-deployment-configmap.yaml8
-rw-r--r--kubernetes/aai/templates/modelloader-deployment.yaml10
3 files changed, 9 insertions, 9 deletions
diff --git a/kubernetes/aai/resources/model-loader/conf/logback.xml b/kubernetes/aai/resources/config/log/model-loader/logback.xml
index d512d3b91c..d512d3b91c 100644
--- a/kubernetes/aai/resources/model-loader/conf/logback.xml
+++ b/kubernetes/aai/resources/config/log/model-loader/logback.xml
diff --git a/kubernetes/aai/templates/modelloader-deployment-configmap.yaml b/kubernetes/aai/templates/modelloader-deployment-configmap.yaml
index 7f37bd605b..e5a59a124d 100644
--- a/kubernetes/aai/templates/modelloader-deployment-configmap.yaml
+++ b/kubernetes/aai/templates/modelloader-deployment-configmap.yaml
@@ -15,4 +15,12 @@ metadata:
type: Opaque
data:
{{ tpl (.Files.Glob "resources/config/model-loader/appconfig/auth/*").AsSecrets . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: aai-model-loader-log-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/log/model-loader/logback.xml").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml
index c81305817c..2508446334 100644
--- a/kubernetes/aai/templates/modelloader-deployment.yaml
+++ b/kubernetes/aai/templates/modelloader-deployment.yaml
@@ -68,16 +68,8 @@ spec:
emptyDir: {}
- name: aai-model-loader-log-conf
configMap:
- name: aai-model-loader-configmap
+ name: aai-model-loader-log-configmap
restartPolicy: Always
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: aai-model-loader-configmap
- namespace: {{ .Values.nsPrefix }}-aai
-data:
-{{ (.Files.Glob "resources/model-loader/conf/logback.xml").AsConfig | indent 2 }}
#{{ end }}