From 38d6d7b99c5fb2f137ba4b22a23f2291fcc554d7 Mon Sep 17 00:00:00 2001 From: mayankg2703 Date: Wed, 7 Feb 2018 05:29:22 +0000 Subject: [PATCH] aai sparky be config alignment Change-Id: I7c8f8732763a39cf0bccec9af4149736c9108ea5 Issue-ID: OOM-666 Signed-off-by: mayankg2703 --- .../{sparky-be/conf => config/log/sparky-be}/logback.xml | 0 kubernetes/aai/templates/sparky-be-deployment-configmap.yaml | 8 ++++++++ kubernetes/aai/templates/sparky-be-deployment.yaml | 10 +--------- 3 files changed, 9 insertions(+), 9 deletions(-) rename kubernetes/aai/resources/{sparky-be/conf => config/log/sparky-be}/logback.xml (100%) diff --git a/kubernetes/aai/resources/sparky-be/conf/logback.xml b/kubernetes/aai/resources/config/log/sparky-be/logback.xml similarity index 100% rename from kubernetes/aai/resources/sparky-be/conf/logback.xml rename to kubernetes/aai/resources/config/log/sparky-be/logback.xml diff --git a/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml b/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml index 55dea653cd..590608b566 100644 --- a/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml +++ b/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml @@ -31,4 +31,12 @@ metadata: type: Opaque data: {{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/auth/*").AsSecrets . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: aai-sparky-be-log-configmap + namespace: {{ .Values.nsPrefix }}-aai +data: +{{ tpl (.Files.Glob "resources/config/log/sparky-be/logback.xml").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml index dfeab6a394..9fe324a817 100644 --- a/kubernetes/aai/templates/sparky-be-deployment.yaml +++ b/kubernetes/aai/templates/sparky-be-deployment.yaml @@ -101,16 +101,8 @@ spec: emptyDir: {} - name: aai-sparky-be-log-conf configMap: - name: aai-sparky-be-configmap + name: aai-sparky-be-log-configmap restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: aai-sparky-be-configmap - namespace: {{ .Values.nsPrefix }}-aai -data: -{{ (.Files.Glob "resources/sparky-be/conf/logback.xml").AsConfig | indent 2 }} #{{ end }} -- 2.16.6