aai resources and traversal config alignment
Change-Id: Ib0b7a59a07e96eb79fd6ca59a5459e4e81de29e2
Issue-ID: OOM-668
Signed-off-by: mayankg2703 <mayank.gupta@amdocs.com>
diff --git a/resources/resources/conf/logback.xml b/resources/config/log/resources/logback.xml
similarity index 100%
rename from resources/resources/conf/logback.xml
rename to resources/config/log/resources/logback.xml
diff --git a/resources/traversal/conf/logback.xml b/resources/config/log/traversal/logback.xml
similarity index 100%
rename from resources/traversal/conf/logback.xml
rename to resources/config/log/traversal/logback.xml
diff --git a/templates/aai-resources-deployment.yaml b/templates/aai-resources-deployment.yaml
index 5ca0c16..2e0b049 100644
--- a/templates/aai-resources-deployment.yaml
+++ b/templates/aai-resources-deployment.yaml
@@ -97,16 +97,8 @@
emptyDir: {}
- name: aai-resources-log-conf
configMap:
- name: aai-resources-configmap
+ name: aai-resources-log-configmap
restartPolicy: Always
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: aai-resources-configmap
- namespace: {{ .Values.nsPrefix }}-aai
-data:
-{{ (.Files.Glob "resources/resources/conf/logback.xml").AsConfig | indent 2 }}
#{{ end }}
diff --git a/templates/aai-resources-traversal-configmap.yaml b/templates/aai-resources-traversal-configmap.yaml
index 772c3a7..ebd6913 100644
--- a/templates/aai-resources-traversal-configmap.yaml
+++ b/templates/aai-resources-traversal-configmap.yaml
@@ -14,4 +14,20 @@
namespace: {{ .Values.nsPrefix }}-aai
data:
{{ tpl (.Files.Glob "resources/config/aai-data/environments/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: aai-resources-log-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/log/resources/logback.xml").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: aai-traversal-log-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/log/traversal/logback.xml").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/templates/aai-traversal-deployment.yaml b/templates/aai-traversal-deployment.yaml
index fda0055..a61a83e 100644
--- a/templates/aai-traversal-deployment.yaml
+++ b/templates/aai-traversal-deployment.yaml
@@ -99,16 +99,8 @@
emptyDir: {}
- name: aai-traversal-log-conf
configMap:
- name: aai-traversal-configmap
+ name: aai-traversal-log-configmap
restartPolicy: Always
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: aai-traversal-configmap
- namespace: {{ .Values.nsPrefix }}-aai
-data:
-{{ (.Files.Glob "resources/traversal/conf/logback.xml").AsConfig | indent 2 }}
#{{ end }}